X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fselfcheck.c;h=a82af7c4c9c4d5c71698884776e8b446eb09ee32;hb=0de2ad0a86685398621fb8ffa6990c029681bb3a;hp=0cfade85051f7b59c193d1f6e8e5e00ffa5d2d84;hpb=3ab887b9bc819a846c75dd7f2ee5d41fac22b19f;p=debian%2Famanda

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index 0cfade8..a82af7c 100644
--- a/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@ -25,7 +25,7 @@
  *			   University of Maryland at College Park
  */
 /* 
- * $Id: selfcheck.c,v 1.40.2.3.4.4.2.22 2003/11/18 18:04:26 martinea Exp $
+ * $Id: selfcheck.c,v 1.40.2.3.4.4.2.22.2.2 2004/08/12 12:30:53 martinea Exp $
  *
  * do self-check and send back any error messages
  */
@@ -58,6 +58,7 @@ int need_vxrestore=0;
 int need_runtar=0;
 int need_gnutar=0;
 int need_compress_path=0;
+int need_calcsize=0;
 
 static am_feature_t *our_features = NULL;
 static char *our_feature_string = NULL;
@@ -66,8 +67,8 @@ static g_option_t *g_options = NULL;
 /* local functions */
 int main P((int argc, char **argv));
 
-static void check_options P((char *program, char *disk, char *device, option_t *options));
-static void check_disk P((char *program, char *disk, char *amdevice, int level));
+static void check_options P((char *program, char *calcprog, char *disk, char *device, option_t *options));
+static void check_disk P((char *program, char *calcprog, char *disk, char *amdevice, int level));
 static void check_overall P((void));
 static void check_access P((char *filename, int mode));
 static void check_file P((char *filename, int mode));
@@ -82,6 +83,7 @@ char **argv;
     int level;
     char *line = NULL;
     char *program = NULL;
+    char *calcprog = NULL;
     char *disk = NULL;
     char *device = NULL;
     char *optstr = NULL;
@@ -155,6 +157,19 @@ char **argv;
 	skip_non_whitespace(s, ch);
 	s[-1] = '\0';				/* terminate the program name */
 
+	if(strncmp(program, "CALCSIZE", 8) == 0) {
+	    skip_whitespace(s, ch);		/* find program name */
+	    if (ch == '\0') {
+		goto err;			/* no program */
+	    }
+	    calcprog = s - 1;
+	    skip_non_whitespace(s, ch);
+	    s[-1] = '\0';
+	}
+	else {
+	    calcprog = NULL;
+	}
+
 	skip_whitespace(s, ch);			/* find disk name */
 	if (ch == '\0') {
 	    goto err;				/* no disk */
@@ -198,8 +213,8 @@ char **argv;
 	    skip_non_whitespace(s, ch);
 	    s[-1] = '\0';			/* terminate the options */
 	    options = parse_options(optstr, disk, device, g_options->features, 1);
-	    check_options(program, disk, device, options);
-	    check_disk(program, disk, device, level);
+	    check_options(program, calcprog, disk, device, options);
+	    check_disk(program, calcprog, disk, device, level);
 	    free_sl(options->exclude_file);
 	    free_sl(options->exclude_list);
 	    free_sl(options->include_file);
@@ -221,7 +236,8 @@ char **argv;
 	    need_runtar=1;
 	    need_gnutar=1;
 	    need_compress_path=1;
-	    check_disk(program, disk, device, level);
+	    need_calcsize=1;
+	    check_disk(program, calcprog, disk, device, level);
 	} else {
 	    goto err;				/* bad syntax */
 	}
@@ -265,11 +281,34 @@ char **argv;
 
 
 static void
-check_options(program, disk, device, options)
-    char *program, *disk, *device;
+check_options(program, calcprog, disk, device, options)
+    char *program, *calcprog, *disk, *device;
     option_t *options;
 {
-    if(strcmp(program,"GNUTAR") == 0) {
+    char *myprogram = program;
+
+    if(strcmp(myprogram,"CALCSIZE") == 0) {
+	int nb_exclude = 0;
+	int nb_include = 0;
+	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, device, options, 1);
+	if(nb_include > 0) file_include = build_include(disk, device, options, 1);
+
+	amfree(file_exclude);
+	amfree(file_include);
+
+	need_calcsize=1;
+	myprogram = calcprog;
+    }
+
+    if(strcmp(myprogram,"GNUTAR") == 0) {
 	need_gnutar=1;
         if(disk[0] == '/' && disk[1] == '/') {
 	    if(options->exclude_file && options->exclude_file->nb_element > 1) {
@@ -308,7 +347,8 @@ check_options(program, disk, device, options)
 	    need_runtar=1;
 	}
     }
-    if(strcmp(program,"DUMP") == 0) {
+
+    if(strcmp(myprogram,"DUMP") == 0) {
 	if(options->exclude_file && options->exclude_file->nb_element > 0) {
 	    printf("ERROR [DUMP does not support exclude file]\n");
 	}
@@ -382,8 +422,8 @@ check_options(program, disk, device, options)
 	need_compress_path=1;
 }
 
-static void check_disk(program, disk, amdevice, level)
-char *program, *disk, *amdevice;
+static void check_disk(program, calcprog, disk, amdevice, level)
+char *program, *calcprog, *disk, *amdevice;
 int level;
 {
     char *device = NULL;
@@ -395,10 +435,22 @@ int level;
     int access_result;
     char *access_type;
     char *extra_info = NULL;
+    char *myprogram = program;
+
+    if(strcmp(myprogram,"CALCSIZE") == 0) {
+	if(amdevice[0] == '/' && amdevice[1] == '/') {
+	    err = vstralloc("Can't use CALCSIZE for samba estimate,",
+			    " use CLIENT: ",
+			    amdevice,
+			    NULL);
+	    goto common_exit;
+	}
+	myprogram = calcprog;
+    }
 
     dbprintf(("%s: checking disk %s\n", debug_prefix_time(NULL), disk));
 
-    if (strcmp(program, "GNUTAR") == 0) {
+    if (strcmp(myprogram, "GNUTAR") == 0) {
         if(amdevice[0] == '/' && amdevice[1] == '/') {
 #ifdef SAMBA_CLIENT
 	    int nullfd, checkerr;
@@ -718,6 +770,16 @@ static void check_overall()
 #endif
     }
 
+    if( need_calcsize ) {
+	char *cmd;
+
+	cmd = vstralloc(libexecdir, "/", "calcsize", versionsuffix(), NULL);
+
+	check_file(cmd, X_OK);
+
+	amfree(cmd);
+    }
+
     if( need_samba ) {
 #ifdef SAMBA_CLIENT
 	check_file(SAMBA_CLIENT, X_OK);