Changeset 911 in MondoRescue for branches/stable/mondo/src/common/libmondo-verify.c

Timestamp:

Nov 1, 2006, 7:46:51 PM (17 years ago)

Author:

Bruno Cornec

Message:

Further removal of all instances of grep -wx in code.

File:

• branches/stable/mondo/src/common/libmondo-verify.c (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-verify.c

@@ -165 +165 @@
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
     sprintf(command,
-            "grep \"afio: \" %s | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
+            "grep \"afio: \" %s | sed 's/afio: //' | grep -vE '^/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,
-            "grep \"star: \" %s | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
+            "grep \"star: \" %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s",
             stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -1149 +1149 @@
             (int) (random() % 32767));
     sprintf(tmp,
-            "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",
+            "grep -E '^%s:.*$' %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vE '^/afio:.*$' | grep -vE '^dev/.*$'  > %s",
             (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE, 
             changed_files_fname);