Changeset 126 in MondoRescue for branches/2.05/mondo/mondo/common/libmondo-archive.c

Timestamp:

Nov 19, 2005, 1:53:52 AM (18 years ago)

Author:

bcornec

Message:

This patch avoids useless invocations of `cat <file> |' where the second
process in the pipe can more efficiently read its input file itself.
It replaces also some grep'+sed' commands by an unique `sed' command.
This patch also improves readability of shell commands by
replacing \" by ' where possible.
This patch instructs mondo to say DVD' instead of CD' when appropriate.
This patch forces growisofs to use speed=1 for DVD burning. In my
experience, DVD burning time is only a small part of the total backup
time so this should not make a big difference in backup time, but
a big one in reliability of mondo. On my installation, without
the option `speed=1', mondo/growisofs is unable to burn a DVD. With
the option `speed=1', mondo works.
(Philippe De Muyter)

File:

• branches/2.05/mondo/mondo/common/libmondo-archive.c (modified) (9 diffs)

branches/2.05/mondo/mondo/common/libmondo-archive.c

@@ -501 +501 @@
   paranoid_system (command);
 
-  sprintf (command, "cat %s | afio -o -b %ld -M 16m %s %s 2>> %s", filelist, TAPE_BLOCK_SIZE, zipparams, fname, MONDO_LOGFILE);
+  sprintf (command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s", TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
 
   sprintf(tmp, "echo hi > %s 2> /dev/null", fname);
@@ -701 +701 @@
   strcpy( scratchdir, bkpinfo->scratchdir);
   sprintf (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);
   strcpy (devs_to_exclude, call_program_and_get_last_line_of_output (tmp));
@@ -935 +935 @@
        
        
-    "mindi --custom %s %s/images \"%s\" \"%s\" \
-\"%s\" %ld \"%s\" \"%s\" \"%s\" \
-\"%s\" %s %ld \"%s\" \"%s\" \"%s\" \"%s\" %ld %d",
+    "mindi --custom %s %s/images '%s' '%s' \
+'%s' %ld '%s' '%s' '%s' \
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d",
 
        bkpinfo->tmpdir,         // parameter #2
@@ -990 +990 @@
     {
       log_to_screen ("Mindi failed to create your boot+data disks.");
-      sprintf (command, "cat %s | grep \"Fatal error\"", "/var/log/mindi.log");
+      sprintf (command, "grep 'Fatal error' %s", "/var/log/mindi.log");
       strcpy (tmp, call_program_and_get_last_line_of_output (command));
       if (strlen (tmp) > 1)
@@ -1818 +1818 @@
             {
               log_to_screen ("%s...OK", message_to_screen);
-          if (!run_program_and_log_output("tail -n10 /var/log/mondo-archive.log | fgrep \":-(\"", 1))
+          if (!run_program_and_log_output("tail -n10 /var/log/mondo-archive.log | fgrep ':-('", 1))
             {
           log_to_screen("Despite nonfatal errors, growisofs confirms the write was successful.");
@@ -1825 +1825 @@
           retval += res;
 #ifdef DVDRWFORMAT
-          sprintf(tmp, "cat %s | tail -n8 | grep \"blank=full.*dvd-compat.*DAO\"", MONDO_LOGFILE);
+          sprintf(tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
       if (g_backup_media_type == dvd && (res || !run_program_and_log_output(tmp, 1)))
             {
@@ -3262 +3262 @@
     {
       file_to_openin = biggie_filename;
-      sprintf (command, "md5sum \"%s\"", biggie_filename);
+      sprintf (command, "md5sum '%s'", biggie_filename);
       if (!(fin = popen (command, "r"))) { log_OS_error("Unable to popen-in command"); return(1); }
       (void) fgets (checksum_line, MAX_STR_LEN, fin);
@@ -3641 +3641 @@
     {
       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()");
@@ -3793 +3793 @@
 */
           sprintf (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);
           
       sprintf (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);