Changeset 273 in MondoRescue for branches/2.06/mondo/mondo/common/libmondo-verify.c

Timestamp:

Jan 3, 2006, 4:09:12 PM (18 years ago)

Author:

bcornec

Message:

Patches from Sébastien Aperghis-Tramoni <maddingue@…>

replace several occurences of "cat .. | grep .."
or with similar commands that accept filenames as arguments.
+ some sort | uniq replaced by sort -u

File:

• branches/2.06/mondo/mondo/common/libmondo-verify.c (modified) (8 diffs)

branches/2.06/mondo/mondo/common/libmondo-verify.c

@@ -159 +159 @@
 
 /*  sprintf (command,
-       "cat %s | grep \"afio: \" | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort | uniq | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
+       "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
        stderr_fname, afio_found_changes);
 */
@@ -165 +165 @@
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
     sprintf(command,
-            "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
+            "grep \"afio: \" %s | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
             stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -175 +175 @@
     log_msg(1, "Now scanning log file for 'star: ' stuff");
     sprintf(command,
-            "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
+            "grep \"star: \" %s | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
             stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -185 +185 @@
     afio_diffs = count_lines_in_file(afio_found_changes);
     sprintf(command,
-            "cat %s %s %s | sort | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
+            "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
             ignorefiles_fname, afio_found_changes, afio_found_changes,
             changedfiles_fname);
@@ -401 +401 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (bkpinfo->compression_level > 0) {
-                sprintf(command, "cat %s | %s -dc 2>> %s",
+                sprintf(command, "%s -dc %s 2>> %s",
+                        sz_exe,
                         slice_fname(bigfile_num, slice_num, mountpoint,
-                                    bkpinfo->zip_suffix), sz_exe,
+                                    bkpinfo->zip_suffix),
                         MONDO_LOGFILE);
             } else {
@@ -543 +544 @@
         sprintf(command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        sprintf(command, "cat %s | cut -d':' -f%d | sort | uniq", outlog,
-                (bkpinfo->use_star) ? 1 : 2);
+        sprintf(command, "cut -d: -f%d %s | sort -u",
+                (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
@@ -580 +581 @@
     }
     /*  chdir(old_pwd); */
-    //  sprintf (tmp, "cat %s | uniq -u >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
+    //  sprintf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
     //  paranoid_system (tmp);
     //  unlink ("/tmp/mondo-verify.err");
@@ -1148 +1149 @@
             (int) (random() % 32767));
     sprintf(tmp,
-            "cat %s | grep -x \"%s:.*\" | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"dev/.*\"  > %s",
-            MONDO_LOGFILE, (bkpinfo->use_star) ? "star" : "afio",
+            "grep -x \"%s:.*\" %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"dev/.*\"  > %s",
+            (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, 
             changed_files_fname);
     log_msg(2, "Running command to derive list of changed files");