Changeset 3205 in MondoRescue for branches/3.2/mondo/src/common/libmondo-tools.c

Timestamp:

Dec 6, 2013, 3:40:47 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix mondoarchive which now works in text mode. GUI mode still not working and crashing on first update for backup. Needs more

investigation in newt-specific.c

File:

• branches/3.2/mondo/src/common/libmondo-tools.c (modified) (5 diffs)

branches/3.2/mondo/src/common/libmondo-tools.c

@@ -366 +366 @@
     assert(bkpinfo != NULL);
 
-    bkpinfo->optimal_set_size =
-        (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
-        1024;
+    bkpinfo->optimal_set_size = (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) * 1024;
 
     log_msg(1, "Post-param");
@@ -383 +381 @@
         if (run_program_and_log_output(tmp, 3)) {
             mr_free(tmp);
-            fatal_error
-                ("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
+            fatal_error("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
         }
         mr_free(tmp);
@@ -451 +448 @@
             // -m isn't supported by growisofs, BTW...
         } else {
-            sprintf(bkpinfo->call_make_iso,
-                    "%s %s -Z %s . 2>> _ERR_",
-                    mondo_mkisofs_sz,
-                    "", bkpinfo->media_device);
+            sprintf(bkpinfo->call_make_iso, "%s %s -Z %s . 2>> _ERR_", mondo_mkisofs_sz, "", bkpinfo->media_device);
         }
         mr_free(mondo_mkisofs_sz);
@@ -519 +513 @@
         if (bkpinfo->manual_cd_tray) {
             if (bkpinfo->call_before_iso[0] == '\0') {
-            sprintf(bkpinfo->call_before_iso,
-                        "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_",
-                        mondo_mkisofs_sz, bkpinfo->tmpdir);
-                } else {
+                sprintf(bkpinfo->call_before_iso, "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_", mondo_mkisofs_sz, bkpinfo->tmpdir);
+            } else {
                 mr_asprintf(call_before_iso_user, "%s", bkpinfo->call_before_iso);
                 sprintf(bkpinfo->call_before_iso, "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )", mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
@@ -1058 +1050 @@
         return (0);
     } else {
-        mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
-                label, config_file);
+        mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         mr_free(command);