Changeset 3154 in MondoRescue for branches/3.0/mondo/src/common/libmondo-cli.c

Timestamp:

Jun 23, 2013, 12:34:33 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Remove the introduction of LogProgress in ListKernelModulePaths which should stay quiet
• Remove a remaining support of max-noof-media in confidure.in now gone.
• Fix #640 by cleaning up fully the managemnt of tmpdir and scratchdir (one function for the creation, one point of removal at end, intermediate removal if needed, clean naming conventions, unify mkdtemp usage, remove sensibly_set_tmpdir_and_scratchdir function). Consequence is that default dir for scratchdir if nothing else specified is /tmp using CLI and the largest partition using the GUI.
• Fix a bug introduced in process_the_s_switch with intermediate variables which weren't initialized correctly.

File:

• branches/3.0/mondo/src/common/libmondo-cli.c (modified) (7 diffs)

branches/3.0/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;
@@ -77 +78 @@
 
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
     char flag_val[128][MAX_STR_LEN];
     bool flag_set[128];
 
-    tmp = malloc(9*MAX_STR_LEN);
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
@@ -93 +93 @@
         retval += res;
     }
-/*
-  if (!retval)
-    {
-*/
+
     log_msg(3, "Switches:-");
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            sprintf(tmp, "-%c %s", i, flag_val[i]);
+            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
-        }
-    }
-//    }
-    /*  Before erasing dirs go into a safe place */
-    if (chdir("/tmp")) {
-        // FIXME
-    }
-    sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
-            "/mondo.scratch.%ld", random() % 32767);
-    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    paranoid_free(tmp);
+            mr_free(tmp);
+        }
+    }
+
     return (retval);
 }
-
-
 
 
@@ -135 +116 @@
 int process_the_s_switch(char *value)
 {
-    int j;
-    char tmp[MAX_STR_LEN], *p, comment[MAX_STR_LEN];
-
     assert(bkpinfo != NULL);
     assert(value != NULL);
 
     bkpinfo->media_size = -1;   /* dummy value */
-    bkpinfo->media_size = friendly_sizestr_to_sizelong(p);
+    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", p);
+        log_msg(1, "You gave media an invalid size %s\n", value);
         return (-1);
     }
@@ -802 +780 @@
 
     if (flag_set['S']) {
-        /* Before changing remove old ones if any */
-        if (bkpinfo->scratchdir) {
-            if (chdir("/tmp")) {
-                // FIXME
-            }
-            mr_asprintf(&tmp1, "rm -Rf %s", bkpinfo->scratchdir);
-            paranoid_system(tmp1);
-            mr_free(tmp1);
-        }
-        sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
-                random() % 32768);
+        setup_scratchdir(flag_val['S']);
+        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
+            log_to_screen("Please specify a scratchdir which I can write to. :)");
+            fatal_error("I cannot write to the scratchdir you specified.");
+        }
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
+            log_to_screen("Please don't specify a SAMBA or VFAT or NFS scratchdir.");
+            fatal_error("I cannot write to the scratchdir you specified.");
+        }
     }
 
@@ -820 +800 @@
         if (run_program_and_log_output(tmp, 1)) {
             retval++;
-            log_to_screen
-                ("Please specify a tempdir which I can write to. :)");
+            log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
         }
@@ -827 +806 @@
         if (run_program_and_log_output(tmp, 1)) {
             retval++;
-            log_to_screen
-                ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
+            log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
             fatal_error("I cannot write to the tempdir you specified.");
         }