Changeset 2320 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 18, 2009, 2:37:39 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (11 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -337 +337 @@
         mr_asprintf(&zipparams, "");
     }
-
-//  make_hole_for_file(fname);
 
     if (!does_file_exist(bkpinfo->tmpdir)) {
@@ -543 +541 @@
 
     assert(bkpinfo != NULL);
-    mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
-    mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
-    log_msg(2, tmp);
-    mr_free(tmp);
+    if (bkpinfo->exclude_paths) {
+        mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
+        mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
+        log_msg(2, tmp);
+        mr_free(tmp);
+    }
 
     mvaddstr_and_log_it(g_currentY, 0,
@@ -885 +885 @@
             last_filelist_number,   // parameter #12 (STRING)
             estimated_total_noof_slices,    // parameter #13 (INT)
-            devs_to_exclude,    // parameter #14
+            (devs_to_exclude == NULL) ? "\"\"" : devs_to_exclude,   // parameter #14
             use_comp_sz,        // parameter #15
             use_lilo_sz,        // parameter #16
@@ -920 +920 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
-                bkpinfo->scratchdir, MINDI_CACHE);
+        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -927 +926 @@
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images",
-                    bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 paranoid_free(command);
@@ -941 +939 @@
             paranoid_free(command);
         } else {
-            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
-                bkpinfo->tmpdir);
+            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
             if (system(tmp)) {
                 fatal_error("Cannot find all.tar.gz in tmpdir");
@@ -1689 +1686 @@
     }
 
-    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
-            bkpinfo->scratchdir, destfile);
+    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
@@ -1727 +1723 @@
         } else {
             res =
-                eval_call_to_make_ISO(bkpinfo->call_make_iso,
-                                      bkpinfo->scratchdir,
-                                      g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+                eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
             if (res) {
                 log_to_screen("%s...failed to write", message_to_screen);
@@ -1789 +1782 @@
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 res =
-                    eval_call_to_make_ISO(bkpinfo->call_make_iso,
-                                          bkpinfo->scratchdir,
-                                          g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                    eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 retval += res;
                 if (!bkpinfo->please_dont_eject) {
@@ -2378 +2367 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
-            bkpinfo->scratchdir);
+        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -3302 +3290 @@
     paranoid_fclose(fout);
 
-    mr_asprintf(&tmp1, "cp -f %s/autorun %s/", g_mondo_home,
-            bkpinfo->scratchdir);
+    mr_asprintf(&tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp1, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");