Changeset 126 in MondoRescue

Timestamp:

Nov 19, 2005, 1:53:52 AM (19 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)

Location:

branches/2.05/mondo/mondo

Files:

• common/libmondo-archive.c (modified) (9 diffs)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-files.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (1 diff)
• common/my-stuff.h (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)

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);

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

@@ -2079 +2079 @@
                  if ((bkpinfo->compression_level = which_compression_level()) == -1)
                      { log_to_screen("User has chosen not to backup the PC"); finish(1); }
-                 if (!popup_and_get_string ("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s you plan to backup to.", sz_size, 16))
+                 if (!popup_and_get_string ("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.", sz_size, 16))
                      { log_to_screen ("User has chosen not to backup the PC"); finish(1); }
                  for(i=0; i<=MAX_NOOF_MEDIA; i++) { bkpinfo->media_size[i] = atoi (sz_size); }

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

@@ -569 +569 @@
         return (output);
     }
-    sprintf(command, "cat %s | tail -n1", filename);
+    sprintf(command, "tail -n1 %s", filename);
     fin = popen(command, "r");
     (void) fgets(output, MAX_STR_LEN, fin);
@@ -1309 +1309 @@
     if (scratchLL <= 1) {
         sprintf(tmp,
-                "Your backup will probably occupy a single CD/tape/ISO. Maybe two.");
+                "Your backup will probably occupy a single %s. Maybe two.",
+                media_descriptor_string(bkpinfo->backup_media_type));
     } else if (scratchLL > 4) {
         sprintf(tmp,

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

@@ -422 +422 @@
 get_time ()
 {
-
-#if 0
-
-    /*@ pointers *****************************************************/
-  FILE *fin;
-
-    /*@ buffers ******************************************************/
-  char incoming[MAX_STR_LEN];
-
-    /*@ end vars *****************************************************/
-
-  if (!(fin = popen ("date +%s", "r"))) { log_OS_error("Cannot popen date"); return(0); }
-  fgets (incoming, MAX_STR_LEN - 1, fin);
-  paranoid_pclose (fin);
-  return (atol (incoming));
-#else
   return (long) time ((void *) 0);
-#endif
 }
 

branches/2.05/mondo/mondo/common/my-stuff.h

@@ -345 +345 @@
  * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
  */
-#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -speed=1 -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b isolinux.bin --boot-info-table -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
  */ // -b images/mindi-boot.2880.img
-#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -speed=1 -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
  */ // -b images/mindi-boot.2880.img
-#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -speed=1 -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
  */
-#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
+#define MONDO_GROWISOFS_NONBOOT          "growisofs -speed=1 -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**

branches/2.05/mondo/mondo/common/newt-specific.c

@@ -562 +562 @@
   if (grep_for_me[0] != '\0')
     {
-      sprintf (command, "cat %s | grep \"%s\" | tail -n%d", filename,
-           grep_for_me, g_noof_log_lines);
-    }
-  else
-    {
-      sprintf (command, "cat %s | tail -n%d", filename, g_noof_log_lines);
+      sprintf (command, "grep '%s' %s | tail -n%d",            
+                    grep_for_me, filename,
+                    g_noof_log_lines);
+    }
+  else
+    {
+      sprintf (command, "cat %s | tail -n%d %s", g_noof_log_lines, filename);
     }
   fin = popen (command, "r");

branches/2.05/mondo/mondo/mondorestore/mondo-prep.c

@@ -478 +478 @@
               {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                    ("cat /var/log/mondo-archive.log | tail -n5 | grep Insufficient | tail -n1"));
+                    ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
               }
             else
               {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                    ("cat /var/log/mondo-archive.log | tail -n5 | grep lvcreate | tail -n1"));
+                    ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
               }
             for(p=tmp; *p!='\0' && !isdigit(*p); p++);