X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fsendbackup.c;h=dacb961e143ab296e4c4e19e3de67a14994795cd;hb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;hp=6ca2787375d5588f61032d5b5341acdd8f09b025;hpb=d74dc4d908fcbc1a4ef474edaf51e61ec90eab6b;p=debian%2Famanda

diff --git a/client-src/sendbackup.c b/client-src/sendbackup.c
index 6ca2787..dacb961 100644
--- a/client-src/sendbackup.c
+++ b/client-src/sendbackup.c
@@ -30,14 +30,13 @@
  */
 
 #include "amanda.h"
+#include "match.h"
 #include "sendbackup.h"
 #include "clock.h"
 #include "pipespawn.h"
 #include "amfeatures.h"
-#include "amandad.h"
 #include "arglist.h"
 #include "getfsent.h"
-#include "version.h"
 #include "conffile.h"
 #include "amandates.h"
 
@@ -125,6 +124,7 @@ main(
     int ch;
     GSList *errlist;
     FILE   *mesgstream;
+    level_t *alevel;
 
     /* initialize */
     /*
@@ -137,6 +137,7 @@ main(
     textdomain("amanda"); 
 
     safe_fd(DATA_FD_OFFSET, DATA_FD_COUNT*2);
+    openbsd_fd_inform();
 
     safe_cd();
 
@@ -156,10 +157,11 @@ main(
 	interactive = 0;
     }
 
-    erroutput_type = (ERR_INTERACTIVE|ERR_SYSLOG);
+    add_amanda_log_handler(amanda_log_stderr);
+    add_amanda_log_handler(amanda_log_syslog);
     dbopen(DBG_SUBDIR_CLIENT);
     startclock();
-    dbprintf(_("Version %s\n"), version());
+    dbprintf(_("Version %s\n"), VERSION);
 
     if(argc > 2 && strcmp(argv[1], "amandad") == 0) {
 	amandad_auth = stralloc(argv[2]);
@@ -297,7 +299,9 @@ main(
 	    goto err;				/* bad level */
 	}
 	skip_integer(s, ch);
-	dle->level = g_slist_append(dle->level, GINT_TO_POINTER(level));
+	alevel = g_new0(level_t, 1);
+	alevel->level = level;
+	dle->levellist = g_slist_append(dle->levellist, alevel);
 
 	skip_whitespace(s, ch);			/* find the dump date */
 	if(ch == '\0') {
@@ -361,27 +365,30 @@ main(
     }
     gdle = dle;
 
-    if (dle->program == NULL ||
-	dle->disk    == NULL ||
-	dle->device  == NULL ||
-	dle->level   == NULL ||
-	dumpdate     == NULL) {
+    if (dle->program   == NULL ||
+	dle->disk      == NULL ||
+	dle->device    == NULL ||
+	dle->levellist == NULL ||
+	dumpdate       == NULL) {
 	err_extra = _("no valid sendbackup request");
 	goto err;
     }
 
-    if (g_slist_length(dle->level) != 1) {
+    if (g_slist_length(dle->levellist) != 1) {
 	err_extra = _("Too many level");
 	goto err;
     }
 
-    level = GPOINTER_TO_INT(dle->level->data);
+    alevel = (level_t *)dle->levellist->data;
+    level = alevel->level;
     dbprintf(_("  Parsed request as: program `%s'\n"), dle->program);
     dbprintf(_("                     disk `%s'\n"), qdisk);
     dbprintf(_("                     device `%s'\n"), qamdevice);
     dbprintf(_("                     level %d\n"), level);
     dbprintf(_("                     since %s\n"), dumpdate);
     dbprintf(_("                     options `%s'\n"), stroptions);
+    dbprintf(_("                     datapath `%s'\n"),
+			    data_path_to_string(dle->data_path));
 
     if (dle->program_is_application_api==1) {
 	/* check that the application_api exist */
@@ -431,6 +438,10 @@ main(
     if(am_has_feature(g_options->features, fe_rep_options_hostname)) {
 	g_printf("hostname=%s;", g_options->hostname);
     }
+    if (!am_has_feature(g_options->features, fe_rep_options_features) &&
+	!am_has_feature(g_options->features, fe_rep_options_hostname)) {
+	g_printf(";");
+    }
     g_printf("\n");
     fflush(stdout);
     if (freopen("/dev/null", "w", stdout) == NULL) {
@@ -461,9 +472,9 @@ main(
     fflush(mesgstream);
 
     if (dle->program_is_application_api==1) {
-	int i, j, k;
+	guint j;
 	char *cmd=NULL;
-	char **argvchild;
+	GPtrArray *argv_ptr;
 	char levelstr[20];
 	backup_support_option_t *bsu;
 	char *compopt = NULL;
@@ -501,12 +512,11 @@ main(
 	    comppid = pipespawn(COMPRESS_PATH, STDIN_PIPE, 0,
 				&dumpout, &compout, &mesgfd,
 				COMPRESS_PATH, compopt, NULL);
-	    dbprintf(_("gnutar: pid %ld: %s"), (long)comppid, COMPRESS_PATH);
 	    if(compopt != skip_argument) {
-		dbprintf(_("pid %ld: %s %s\n"),
+		dbprintf(_("compress pid %ld: %s %s\n"),
 			 (long)comppid, COMPRESS_PATH, compopt);
 	    } else {
-		dbprintf(_("pid %ld: %s\n"), (long)comppid, COMPRESS_PATH);
+		dbprintf(_("compress pid %ld: %s\n"), (long)comppid, COMPRESS_PATH);
 	    }
 	} else if (dle->compress == COMP_CUST) {
 	    compopt = skip_argument;
@@ -567,63 +577,55 @@ main(
 
 	switch(application_api_pid=fork()) {
 	case 0:
+	    argv_ptr = g_ptr_array_new();
 	    cmd = vstralloc(APPLICATION_DIR, "/", dle->program, NULL);
-	    k = application_property_argv_size(dle);
-	    for (scriptlist = dle->scriptlist; scriptlist != NULL;
-		 scriptlist = scriptlist->next) {
-		script = (script_t *)scriptlist->data;
-		if (script->result && script->result->proplist) {
-		    k += property_argv_size(script->result->proplist);
-		}
-	    }
-	    argvchild = g_new0(char *, 20 + k);
-	    i=0;
-	    argvchild[i++] = dle->program;
-	    argvchild[i++] = "backup";
+	    g_ptr_array_add(argv_ptr, stralloc(dle->program));
+	    g_ptr_array_add(argv_ptr, stralloc("backup"));
 	    if (bsu->message_line == 1) {
-		argvchild[i++] = "--message";
-		argvchild[i++] = "line";
+		g_ptr_array_add(argv_ptr, stralloc("--message"));
+		g_ptr_array_add(argv_ptr, stralloc("line"));
 	    }
 	    if (g_options->config && bsu->config == 1) {
-		argvchild[i++] = "--config";
-		argvchild[i++] = g_options->config;
+		g_ptr_array_add(argv_ptr, stralloc("--config"));
+		g_ptr_array_add(argv_ptr, stralloc(g_options->config));
 	    }
 	    if (g_options->hostname && bsu->host == 1) {
-		argvchild[i++] = "--host";
-		argvchild[i++] = g_options->hostname;
+		g_ptr_array_add(argv_ptr, stralloc("--host"));
+		g_ptr_array_add(argv_ptr, stralloc(g_options->hostname));
 	    }
 	    if (dle->disk && bsu->disk == 1) {
-		argvchild[i++] = "--disk";
-		argvchild[i++] = dle->disk;
+		g_ptr_array_add(argv_ptr, stralloc("--disk"));
+		g_ptr_array_add(argv_ptr, stralloc(dle->disk));
 	    }
-	    argvchild[i++] = "--device";
-	    argvchild[i++] = dle->device;
+	    g_ptr_array_add(argv_ptr, stralloc("--device"));
+	    g_ptr_array_add(argv_ptr, stralloc(dle->device));
 	    if (level <= bsu->max_level) {
-		argvchild[i++] = "--level";
+		g_ptr_array_add(argv_ptr, stralloc("--level"));
 		g_snprintf(levelstr,19,"%d",level);
-		argvchild[i++] = levelstr;
+		g_ptr_array_add(argv_ptr, stralloc(levelstr));
 	    }
 	    if (indexfd != -1 && bsu->index_line == 1) {
-		argvchild[i++] = "--index";
-		argvchild[i++] = "line";
+		g_ptr_array_add(argv_ptr, stralloc("--index"));
+		g_ptr_array_add(argv_ptr, stralloc("line"));
 	    }
 	    if (dle->record && bsu->record == 1) {
-		argvchild[i++] = "--record";
+		g_ptr_array_add(argv_ptr, stralloc("--record"));
 	    }
-	    i += application_property_add_to_argv(&argvchild[i], dle, bsu);
+	    application_property_add_to_argv(argv_ptr, dle, bsu,
+					     g_options->features);
 
 	    for (scriptlist = dle->scriptlist; scriptlist != NULL;
 		 scriptlist = scriptlist->next) {
 		script = (script_t *)scriptlist->data;
 		if (script->result && script->result->proplist) {
-		    i += property_add_to_argv(&argvchild[i],
-					      script->result->proplist);
+		    property_add_to_argv(argv_ptr, script->result->proplist);
 		}
 	    }
 
-	    argvchild[i] = NULL;
+	    g_ptr_array_add(argv_ptr, NULL);
 	    dbprintf(_("%s: running \"%s\n"), get_pname(), cmd);
-	    for(j=1;j<i;j++) dbprintf(" %s\n",argvchild[j]);
+	    for (j = 1; j < argv_ptr->len - 1; j++)
+		dbprintf(" %s\n", (char *)g_ptr_array_index(argv_ptr,j));
 	    dbprintf(_("\"\n"));
 	    if(dup2(dumpout, 1) == -1) {
 		error(_("Can't dup2: %s"),strerror(errno));
@@ -650,7 +652,7 @@ main(
 	    } else {
 		safe_fd(3, 1);
 	    }
-	    execve(cmd, argvchild, safe_env());
+	    execve(cmd, (char **)argv_ptr->pdata, safe_env());
 	    exit(1);
 	    break;
  
@@ -687,7 +689,8 @@ main(
 		finish_amandates();
 		free_amandates();
 	    } else {
-		if (dle->calcsize && bsu->calcsize) {
+		if (GPOINTER_TO_INT(dle->estimatelist->data) == ES_CALCSIZE &&
+		    bsu->calcsize) {
 		    error(_("error [opening %s for writing: %s]"),
 			  amandates_file, strerror(errno));
 		} else {