Changeset 127 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Nov 19, 2005, 2:27:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r 125:126 $SVN_M/branches/2.05

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (10 diffs)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -358 +358 @@
     paranoid_free(command);
 
-    asprintf(&command, "cat %s | afio -o -b %ld -M 16m %s %s 2>> %s",
-             filelist, TAPE_BLOCK_SIZE, zipparams, fname, MONDO_LOGFILE);
+    asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
+             TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
     paranoid_free(zipparams);
 
@@ -556 +556 @@
 
     asprintf(&tmp,
-             "echo \"%s\" | tr -s ' ' '\n' | grep -x \"/dev/.*\" | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
+             "echo '%s' | tr -s ' ' '\n' | grep -x '/dev/.*' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
              bkpinfo->exclude_paths);
     asprintf(&devs_to_exclude,
@@ -832 +832 @@
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-             "mindi --custom %s %s/images \"%s\" \"%s\" \
-\"%s\" %ld \"%s\" \"%s\" \"%s\" \
-\"%s\" %s %ld \"%s\" \"%s\" \"%s\" \"%s\" %ld %d %s", bkpinfo->tmpdir,  // parameter #2
+             "mindi --custom %s %s/images '%s' '%s' \
+'%s' %ld '%s' '%s' '%s' \
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d %s", bkpinfo->tmpdir,    // parameter #2
              bkpinfo->scratchdir,   // parameter #3
              bkpinfo->kernel_path,  // parameter #4
@@ -917 +917 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        asprintf(&command, "cat %s | grep \"Fatal error\"",
-                 "/var/log/mindi.log");
+        asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
         asprintf(&tmp, call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
@@ -1715 +1714 @@
                 log_to_screen("%s...OK", message_to_screen);
                 if (!run_program_and_log_output
-                    ("tail -n10 /var/log/mondo-archive.log | fgrep \":-(\"",
+                    ("tail -n10 /var/log/mondo-archive.log | fgrep ':-('",
                      1)) {
                     log_to_screen
@@ -1724 +1723 @@
 #ifdef DVDRWFORMAT
             asprintf(&tmp,
-                     "cat %s | tail -n8 | grep \"blank=full.*dvd-compat.*DAO\"",
+                     "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
                      MONDO_LOGFILE);
             if (g_backup_media_type == dvd
@@ -3105 +3104 @@
     } else {
         file_to_openin = biggie_filename;
-        asprintf(&command, "md5sum \"%s\"", biggie_filename);
+        asprintf(&command, "md5sum '%s'", biggie_filename);
         if (!(fin = popen(command, "r"))) {
             log_OS_error("Unable to popen-in command");
@@ -3508 +3507 @@
         if (bkpinfo->verify_data && !res) {
             log_to_screen
-                ("Please reboot from the 1st CD in Compare Mode, as a precaution.");
+                ("Please reboot from the 1st %s in Compare Mode, as a precaution.",
+                 media_descriptor_string(g_backup_media_type));
             chdir("/");
             iamhere("Before calling verify_cd_image()");
@@ -3640 +3640 @@
 */
         asprintf(&tmp,
-                 "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
+                 "sed -n -e 's/afio: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);
@@ -3646 +3646 @@
 
         asprintf(&tmp,
-                 "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> /tmp/changed.files",
+                 "sed -n -e 's/star: //p' %s | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);