X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fsendbackup-gnutar.c;h=1aeb399520d00e98333d00e6f3a3a46a138fd644;hb=4f0b86f7a23848c16cfe82fae81e639917fcff27;hp=c11b55c5a65947ea1984fba7b4ab7274c3f7aa54;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/client-src/sendbackup-gnutar.c b/client-src/sendbackup-gnutar.c
index c11b55c..1aeb399 100644
--- a/client-src/sendbackup-gnutar.c
+++ b/client-src/sendbackup-gnutar.c
@@ -35,7 +35,6 @@
 #include "clock.h"
 #include "util.h"
 #include "getfsent.h"			/* for amname_to_dirname lookup */
-#include "version.h"
 #include "conffile.h"
 
 #ifdef SAMBA_CLIENT
@@ -126,17 +125,13 @@ time_t cur_dumptime;
 
 static char *gnutar_list_dir = NULL;
 static char *incrname = NULL;
-static char *amandates_file;
 /*
  *  doing similar to $ gtar | compression | encryption 
  */
 static void
 start_backup(
-    char *	host,
-    char *	disk,
-    char *	amdevice,
-    int		level,
-    char *	dumpdate,
+    dle_t      *dle,
+    char       *host,
     int		dataf,
     int		mesgf,
     int		indexf)
@@ -147,10 +142,10 @@ start_backup(
     char *indexcmd = NULL;
     char *dirname = NULL;
     int l;
-    char dumptimestr[80];
+    char dumptimestr[80] = "UNUSED";
     struct tm *gmtm;
-    amandates_t *amdates;
-    time_t prev_dumptime;
+    amandates_t *amdates = NULL;
+    time_t prev_dumptime = 0;
     char *error_pn = NULL;
     char *compopt  = NULL;
     char *encryptopt = skip_argument;
@@ -160,38 +155,39 @@ start_backup(
     int infd, outfd;
     ssize_t nb;
     char buf[32768];
-
-    (void)dumpdate;	/* Quiet unused parameter warning */
+    char *amandates_file = NULL;
+    am_level_t *alevel = (am_level_t *)dle->levellist->data;
+    int      level  = alevel->level;
 
     error_pn = stralloc2(get_pname(), "-smbclient");
 
-    qdisk = quote_string(disk);
+    qdisk = quote_string(dle->disk);
     dbprintf(_("start: %s:%s lev %d\n"), host, qdisk, level);
 
     g_fprintf(stderr, _("%s: start [%s:%s level %d]\n"),
 	    get_pname(), host, qdisk, level);
 
      /*  apply client-side encryption here */
-     if ( options->encrypt == ENCRYPT_CUST ) {
-         encpid = pipespawn(options->clnt_encrypt, STDIN_PIPE,
+     if ( dle->encrypt == ENCRYPT_CUST ) {
+         encpid = pipespawn(dle->clnt_encrypt, STDIN_PIPE, 0, 
 			&compout, &dataf, &mesgf, 
-			options->clnt_encrypt, encryptopt, NULL);
-         dbprintf(_("gnutar: pid %ld: %s\n"), (long)encpid, options->clnt_encrypt);
+			dle->clnt_encrypt, encryptopt, NULL);
+         dbprintf(_("gnutar: pid %ld: %s\n"), (long)encpid, dle->clnt_encrypt);
     } else {
        compout = dataf;
        encpid = -1;
     } 
      /*  now do the client-side compression */
-    if(options->compress == COMP_FAST || options->compress == COMP_BEST) {
+    if(dle->compress == COMP_FAST || dle->compress == COMP_BEST) {
           compopt = skip_argument;
 #if defined(COMPRESS_BEST_OPT) && defined(COMPRESS_FAST_OPT)
-	if(options->compress == COMP_BEST) {
+	if(dle->compress == COMP_BEST) {
 	    compopt = COMPRESS_BEST_OPT;
 	} else {
 	    compopt = COMPRESS_FAST_OPT;
 	}
 #endif
-	comppid = pipespawn(COMPRESS_PATH, STDIN_PIPE,
+	comppid = pipespawn(COMPRESS_PATH, STDIN_PIPE, 0,
 			    &dumpout, &compout, &mesgf,
 			    COMPRESS_PATH, compopt, NULL);
 	dbprintf(_("gnutar: pid %ld: %s"), (long)comppid, COMPRESS_PATH);
@@ -201,16 +197,16 @@ start_backup(
 	} else {
 	    dbprintf(_("pid %ld: %s\n"), (long)comppid, COMPRESS_PATH);
 	}
-     } else if (options->compress == COMP_CUST) {
+     } else if (dle->compress == COMP_CUST) {
         compopt = skip_argument;
-	comppid = pipespawn(options->clntcompprog, STDIN_PIPE,
+	comppid = pipespawn(dle->compprog, STDIN_PIPE, 0,
 			    &dumpout, &compout, &mesgf,
-			    options->clntcompprog, compopt, NULL);
+			    dle->compprog, compopt, NULL);
 	if(compopt != skip_argument) {
 	    dbprintf(_("pid %ld: %s %s\n"),
-		     (long)comppid, options->clntcompprog, compopt);
+		     (long)comppid, dle->compprog, compopt);
 	} else {
-	    dbprintf(_("pid %ld: %s\n"), (long)comppid, options->clntcompprog);
+	    dbprintf(_("pid %ld: %s\n"), (long)comppid, dle->compprog);
 	}
     } else {
 	dumpout = compout;
@@ -222,7 +218,7 @@ start_backup(
 	gnutar_list_dir = NULL;
 
 #ifdef SAMBA_CLIENT							/* { */
-    if (amdevice[0] == '/' && amdevice[1]=='/')
+    if (dle->device[0] == '/' && dle->device[1]=='/')
 	amfree(incrname);
     else
 #endif									/* } */
@@ -231,7 +227,7 @@ start_backup(
 	char number[NUM_STR_SIZE];
 	char *inputname = NULL;
 	int baselevel;
-	char *sdisk = sanitise_filename(disk);
+	char *sdisk = sanitise_filename(dle->disk);
 
 	basename = vstralloc(gnutar_list_dir,
 			     "/",
@@ -283,7 +279,7 @@ start_backup(
 	}
 
 	while ((nb = read(infd, &buf, SIZEOF(buf))) > 0) {
-	    if (fullwrite(outfd, &buf, (size_t)nb) < nb) {
+	    if (full_write(outfd, &buf, (size_t)nb) < (size_t)nb) {
 		error(_("error [writing to '%s': %s]"), incrname,
 		       strerror(errno));
 		/*NOTREACHED*/
@@ -317,41 +313,42 @@ start_backup(
 	amfree(tquoted);
 	amfree(inputname);
 	amfree(basename);
-    }
-
-    /* find previous dump time */
+    } else {
+	/* no gnutar-listdir, so we're using amandates */
 
-    amandates_file = getconf_str(CNF_AMANDATES);
-    if(!start_amandates(amandates_file, 0)) {
-	error(_("error [opening %s: %s]"), amandates_file, strerror(errno));
-	/*NOTREACHED*/
-    }
+	/* find previous dump time, failing completely if there's a problem */
+	amandates_file = getconf_str(CNF_AMANDATES);
+	if(!start_amandates(amandates_file, 0)) {
+	    error(_("error [opening %s: %s]"), amandates_file, strerror(errno));
+	    /*NOTREACHED*/
+	}
 
-    amdates = amandates_lookup(disk);
+	amdates = amandates_lookup(dle->disk);
 
-    prev_dumptime = EPOCH;
-    for(l = 0; l < level; l++) {
-	if(amdates->dates[l] > prev_dumptime)
-	    prev_dumptime = amdates->dates[l];
-    }
+	prev_dumptime = EPOCH;
+	for(l = 0; l < level; l++) {
+	    if(amdates->dates[l] > prev_dumptime)
+		prev_dumptime = amdates->dates[l];
+	}
 
-    finish_amandates();
-    free_amandates();
+	finish_amandates();
+	free_amandates();
 
-    gmtm = gmtime(&prev_dumptime);
-    g_snprintf(dumptimestr, SIZEOF(dumptimestr),
-		"%04d-%02d-%02d %2d:%02d:%02d GMT",
-		gmtm->tm_year + 1900, gmtm->tm_mon+1, gmtm->tm_mday,
-		gmtm->tm_hour, gmtm->tm_min, gmtm->tm_sec);
+	gmtm = gmtime(&prev_dumptime);
+	g_snprintf(dumptimestr, SIZEOF(dumptimestr),
+		    "%04d-%02d-%02d %2d:%02d:%02d GMT",
+		    gmtm->tm_year + 1900, gmtm->tm_mon+1, gmtm->tm_mday,
+		    gmtm->tm_hour, gmtm->tm_min, gmtm->tm_sec);
 
-    dbprintf(_("gnutar: doing level %d dump from date: %s\n"),
-	      level, dumptimestr);
+	dbprintf(_("gnutar: doing level %d dump from amandates-derived date: %s\n"),
+		  level, dumptimestr);
+    }
 
-    dirname = amname_to_dirname(amdevice);
+    dirname = amname_to_dirname(dle->device);
 
     cur_dumptime = time(0);
     cur_level = level;
-    cur_disk = stralloc(disk);
+    cur_disk = stralloc(dle->disk);
 #ifdef GNUTAR
 #  define PROGRAM_GNUTAR GNUTAR
 #else
@@ -367,7 +364,7 @@ start_backup(
 
 #ifdef SAMBA_CLIENT							/* { */
     /* Use sambatar if the disk to back up is a PC disk */
-    if (amdevice[0] == '/' && amdevice[1]=='/') {
+    if (dle->device[0] == '/' && dle->device[1]=='/') {
 	char *sharename = NULL, *user_and_password = NULL, *domain = NULL;
 	char *share = NULL, *subdir = NULL;
 	char *pwtext = NULL;
@@ -377,7 +374,7 @@ start_backup(
 	size_t pwtext_len;
 	char *pw_fd_env;
 
-	parsesharename(amdevice, &share, &subdir);
+	parsesharename(dle->device, &share, &subdir);
 	if (!share) {
 	    amfree(share);
 	    amfree(subdir);
@@ -433,7 +430,7 @@ start_backup(
 	}
 
 	taropt = stralloc("-T");
-	if(options->exclude_file && options->exclude_file->nb_element == 1) {
+	if(dle->exclude_file && dle->exclude_file->nb_element == 1) {
 	    strappend(taropt, "X");
 	}
 #if SAMBA_VERSION >= 2
@@ -442,7 +439,7 @@ start_backup(
 	strappend(taropt, "c");
 	if (level != 0) {
 	    strappend(taropt, "g");
-	} else if (!options->no_record) {
+	} else if (dle->record) {
 	    strappend(taropt, "a");
 	}
 
@@ -454,16 +451,16 @@ start_backup(
 
 	program->backup_name = program->restore_name = SAMBA_CLIENT;
 	cmd = stralloc(program->backup_name);
-	info_tapeheader();
+	info_tapeheader(dle);
 
-	start_index(options->createindex, dumpout, mesgf, indexf, indexcmd);
+	start_index(dle->create_index, dumpout, mesgf, indexf, indexcmd);
 
 	if (pwtext_len > 0) {
 	    pw_fd_env = "PASSWD_FD";
 	} else {
 	    pw_fd_env = "dummy_PASSWD_FD";
 	}
-	dumppid = pipespawn(cmd, STDIN_PIPE|PASSWD_PIPE,
+	dumppid = pipespawn(cmd, STDIN_PIPE|PASSWD_PIPE, 0,
 			    &dumpin, &dumpout, &mesgf,
 			    pw_fd_env, &passwdf,
 			    "smbclient",
@@ -480,13 +477,13 @@ start_backup(
 			    "-d0",
 			    taropt,
 			    "-",
-			    options->exclude_file && options->exclude_file->nb_element == 1 ? options->exclude_file->first->name : skip_argument,
+			    dle->exclude_file && dle->exclude_file->nb_element == 1 ? dle->exclude_file->first->name : skip_argument,
 			    NULL);
 	if(domain) {
 	    memset(domain, '\0', strlen(domain));
 	    amfree(domain);
 	}
-	if(pwtext_len > 0 && fullwrite(passwdf, pwtext, pwtext_len) < 0) {
+	if(pwtext_len > 0 && full_write(passwdf, pwtext, pwtext_len) < pwtext_len) {
 	    int save_errno = errno;
 
 	    aclose(passwdf);
@@ -511,50 +508,47 @@ start_backup(
 
 	int nb_exclude = 0;
 	int nb_include = 0;
-	char **my_argv;
-	int i = 0;
+	GPtrArray *argv_ptr = g_ptr_array_new();
 	char *file_exclude = NULL;
 	char *file_include = NULL;
 
-	if(options->exclude_file) nb_exclude+=options->exclude_file->nb_element;
-	if(options->exclude_list) nb_exclude+=options->exclude_list->nb_element;
-	if(options->include_file) nb_include+=options->include_file->nb_element;
-	if(options->include_list) nb_include+=options->include_list->nb_element;
-
-	if(nb_exclude > 0) file_exclude = build_exclude(disk, amdevice, options, 0);
-	if(nb_include > 0) file_include = build_include(disk, amdevice, options, 0);
+	if (dle->exclude_file) nb_exclude+=dle->exclude_file->nb_element;
+	if (dle->exclude_list) nb_exclude+=dle->exclude_list->nb_element;
+	if (dle->include_file) nb_include+=dle->include_file->nb_element;
+	if (dle->include_list) nb_include+=dle->include_list->nb_element;
 
-	my_argv = alloc(SIZEOF(char *) * (22 + (nb_exclude*2)+(nb_include*2)));
+	if (nb_exclude > 0) file_exclude = build_exclude(dle, 0);
+	if (nb_include > 0) file_include = build_include(dle, 0);
 
-	cmd = vstralloc(amlibexecdir, "/", "runtar", versionsuffix(), NULL);
-	info_tapeheader();
+	cmd = vstralloc(amlibexecdir, "/", "runtar", NULL);
+	info_tapeheader(dle);
 
-	start_index(options->createindex, dumpout, mesgf, indexf, indexcmd);
+	start_index(dle->create_index, dumpout, mesgf, indexf, indexcmd);
 
-        my_argv[i++] = "runtar";
+	g_ptr_array_add(argv_ptr, stralloc("runtar"));
 	if (g_options->config)
-	    my_argv[i++] = g_options->config;
+	    g_ptr_array_add(argv_ptr, stralloc(g_options->config));
 	else
-	    my_argv[i++] = "NOCONFIG";
+	    g_ptr_array_add(argv_ptr, stralloc("NOCONFIG"));
 #ifdef GNUTAR
-	my_argv[i++] = GNUTAR;
+	g_ptr_array_add(argv_ptr, stralloc(GNUTAR));
 #else
-	my_argv[i++] = "tar";
+	g_ptr_array_add(argv_ptr, stralloc("tar"));
 #endif
-	my_argv[i++] = "--create";
-	my_argv[i++] = "--file";
-	my_argv[i++] = "-";
-	my_argv[i++] = "--directory";
+	g_ptr_array_add(argv_ptr, stralloc("--create"));
+	g_ptr_array_add(argv_ptr, stralloc("--file"));
+	g_ptr_array_add(argv_ptr, stralloc("-"));
+	g_ptr_array_add(argv_ptr, stralloc("--directory"));
 	canonicalize_pathname(dirname, tmppath);
-	my_argv[i++] = tmppath;
-	my_argv[i++] = "--one-file-system";
+	g_ptr_array_add(argv_ptr, stralloc(tmppath));
+	g_ptr_array_add(argv_ptr, stralloc("--one-file-system"));
 	if (gnutar_list_dir && incrname) {
-	    my_argv[i++] = "--listed-incremental";
-	    my_argv[i++] = incrname;
+	    g_ptr_array_add(argv_ptr, stralloc("--listed-incremental"));
+	    g_ptr_array_add(argv_ptr, stralloc(incrname));
 	} else {
-	    my_argv[i++] = "--incremental";
-	    my_argv[i++] = "--newer";
-	    my_argv[i++] = dumptimestr;
+	    g_ptr_array_add(argv_ptr, stralloc("--incremental"));
+	    g_ptr_array_add(argv_ptr, stralloc("--newer"));
+	    g_ptr_array_add(argv_ptr, stralloc(dumptimestr));
 	}
 #ifdef ENABLE_GNUTAR_ATIME_PRESERVE
 	/* --atime-preserve causes gnutar to call
@@ -562,31 +556,32 @@ start_backup(
 	 * adjust their atime.  However, utime()
 	 * updates the file's ctime, so incremental
 	 * dumps will think the file has changed. */
-	my_argv[i++] = "--atime-preserve";
+	g_ptr_array_add(argv_ptr, stralloc("--atime-preserve"));
 #endif
-	my_argv[i++] = "--sparse";
-	my_argv[i++] = "--ignore-failed-read";
-	my_argv[i++] = "--totals";
+	g_ptr_array_add(argv_ptr, stralloc("--sparse"));
+	g_ptr_array_add(argv_ptr, stralloc("--ignore-failed-read"));
+	g_ptr_array_add(argv_ptr, stralloc("--totals"));
 
 	if(file_exclude) {
-	    my_argv[i++] = "--exclude-from";
-	    my_argv[i++] = file_exclude;
+	    g_ptr_array_add(argv_ptr, stralloc("--exclude-from"));
+	    g_ptr_array_add(argv_ptr, stralloc(file_exclude));
 	}
 
 	if(file_include) {
-	    my_argv[i++] = "--files-from";
-	    my_argv[i++] = file_include;
+	    g_ptr_array_add(argv_ptr, stralloc("--files-from"));
+	    g_ptr_array_add(argv_ptr, stralloc(file_include));
 	}
 	else {
-	    my_argv[i++] = ".";
+	    g_ptr_array_add(argv_ptr, stralloc("."));
 	}
-	my_argv[i++] = NULL;
-	dumppid = pipespawnv(cmd, STDIN_PIPE,
-			     &dumpin, &dumpout, &mesgf, my_argv);
+	    g_ptr_array_add(argv_ptr, NULL);
+	dumppid = pipespawnv(cmd, STDIN_PIPE, 0,
+			     &dumpin, &dumpout, &mesgf,
+			     (char **)argv_ptr->pdata);
 	tarpid = dumppid;
 	amfree(file_exclude);
 	amfree(file_include);
-	amfree(my_argv);
+	g_ptr_array_free_full(argv_ptr);
     }
     dbprintf(_("gnutar: %s: pid %ld\n"), cmd, (long)dumppid);
 
@@ -603,15 +598,18 @@ start_backup(
     aclose(compout);
     aclose(dataf);
     aclose(mesgf);
-    if (options->createindex)
+    if (dle->create_index)
 	aclose(indexf);
 }
 
 static void
 end_backup(
+    dle_t      *dle,
     int		goterror)
 {
-    if(!options->no_record && !goterror) {
+    char *amandates_file = NULL;
+
+    if(dle->record && !goterror) {
 	if (incrname != NULL && strlen(incrname) > 4) {
 	    char *nodotnew;
 	
@@ -625,14 +623,22 @@ end_backup(
 	    amfree(incrname);
 	}
 
-        if(!start_amandates(amandates_file, 1)) {
-	    g_fprintf(stderr, _("%s: warning [opening %s: %s]"), get_pname(),
-		    amandates_file, strerror(errno));
-	}
-	else {
+	/* update the amandates file */
+	amandates_file = getconf_str(CNF_AMANDATES);
+	if(start_amandates(amandates_file, 1)) {
 	    amandates_updateone(cur_disk, cur_level, cur_dumptime);
 	    finish_amandates();
 	    free_amandates();
+	} else {
+	    /* failure is only fatal if we didn't get a gnutar-listdir */
+	    char *gnutar_list_dir = getconf_str(CNF_GNUTAR_LIST_DIR);
+	    if (!gnutar_list_dir || !*gnutar_list_dir) {
+		error(_("error [opening %s for writing: %s]"), amandates_file, strerror(errno));
+		/* NOTREACHED */
+	    } else {
+		g_debug(_("non-fatal error opening '%s' for writing: %s]"),
+			amandates_file, strerror(errno));
+	    }
 	}
     }
 }