Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-cli.c (modified) (16 diffs)

branches/3.1/mondo/src/common/libmondo-cli.c

@@ -39 +39 @@
 
 extern void setup_tmpdir(char *path);
+extern void setup_scratchdir(char *path);
 void mr_make_devlist_from_pathlist(char *pathlist, char mode);
 extern double g_kernel_version;
@@ -85 +86 @@
         flag_set[i] = FALSE;
     }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = 650;
-    }                           /* default */
+    bkpinfo->media_size = 650; /* default */
     res = retrieve_switches_from_command_line(argc, argv, flag_val, flag_set);
     retval += res;
@@ -94 +93 @@
         retval += res;
     }
+
     log_msg(3, "Switches:-");
     for (i = 0; i < 128; i++) {
@@ -100 +100 @@
         }
     }
-    mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    /*  Before erasing dirs go into a safe place */
-    if (chdir("/tmp")) {
-        // FIXME
-    }
-    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
+
     return (retval);
 }
-
-
 
 
@@ -130 +114 @@
 int process_the_s_switch(char *value)
 {
-    int j;
-    char tmp[MAX_STR_LEN], *p; 
-
     assert(bkpinfo != NULL);
     assert(value != NULL);
 
-    bkpinfo->media_size[0] = -1;    /* dummy value */
-    for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
-         j++, p = strchr(p, ',') + 1) {
-        strncpy(tmp, p, MAX_STR_LEN);
-        *(strchr(tmp, ',')) = '\0';
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        log_msg(3, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
-    }
-    for (; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
-    }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        if (bkpinfo->media_size[j] <= 0) {
-            log_msg(1, "You gave media #%d an invalid size\n", j);
-            return (-1);
-        }
+    bkpinfo->media_size = -1;   /* dummy value */
+    bkpinfo->media_size = friendly_sizestr_to_sizelong(value);
+    log_msg(3, "media_size = %ld", bkpinfo->media_size);
+    if (bkpinfo->media_size <= 0) {
+        log_msg(1, "You gave media an invalid size %s\n", value);
+        return (-1);
     }
     return (0);
@@ -269 +240 @@
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
+        }
+        if (!strcmp(bkpinfo->include_paths, "/")) {
+            log_msg(2, "'/' is pleonastic.");
+            bkpinfo->include_paths[0] = '\0';
+        }
+        if (bkpinfo->include_paths[0]) {
+            strcat(bkpinfo->include_paths, "|");
         }
 
@@ -361 +339 @@
         mr_free(tmp1);
         flag_set['d'] = TRUE;
-        strcpy(flag_val['d'], p);
-        mr_free(p);
         log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
     }
@@ -429 +405 @@
                 }
             } else if (flag_set['u'] || flag_set['t']) {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 0;
-                }
+                bkpinfo->media_size = 0;
             } else {
                 retval++;
@@ -483 +457 @@
         /* p points on to the string server:/path */
         /* Store the 2 values */
+        /*  using memmove instead of strcpy as per #584 */
+        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
         bkpinfo->netfs_mount = p;
 
@@ -492 +468 @@
             p++;
             /* new netfs mount */
-            bkpinfo->netfs_mount = p;
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
+            /* now that user is computed, create the right value by removing end of string */
             p--;
             *p = '\0';
@@ -506 +483 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
-                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
                     mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
@@ -521 +496 @@
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
                     mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
-                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
@@ -611 +584 @@
 
     if (flag_set['E']) {
-        if (bkpinfo->exclude_paths && bkpinfo->exclude_paths[0] == '-') {
+        if (bkpinfo->exclude_paths && (bkpinfo->exclude_paths[0] == '-')) {
             retval++;
             log_to_screen("Please supply a sensible value with '-E'\n");
@@ -758 +731 @@
         if (i) {
             retval++;
-            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
+            log_to_screen("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
         }
         unlink(tmp1);
@@ -805 +778 @@
             mr_free(tmp1);
         }
-        mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
+
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp1, 1)) {
+            retval++;
+            mr_free(tmp1);
+            log_to_screen("Please don't specify a SAMBA or VFAT or NFS scratchdir.");
+            fatal_error("I cannot write to the scratchdir you specified.");
+        }
+        mr_free(tmp1);
     }
 
@@ -815 +796 @@
 
         if (i) {
+            retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");