Changeset 911 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-tools.c (modified) (4 diffs)
• libmondo-verify.c (modified) (3 diffs)

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

@@ -736 +736 @@
     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 -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
             bkpinfo->exclude_paths);
     strcpy(devs_to_exclude, call_program_and_get_last_line_of_output(tmp));
@@ -3884 +3884 @@
 */
         sprintf(tmp,
-                "grep 'afio: ' %s | sed 's/afio: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
+                "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
                 MONDO_LOGFILE);
         system(tmp);
 
         sprintf(tmp,
-                "grep 'star: ' %s | sed 's/star: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
+                "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
                 MONDO_LOGFILE);
         system(tmp);

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

@@ -625 +625 @@
     strcpy(tmp,
            call_program_and_get_last_line_of_output
-           ("free | grep \":\" | tr -s ' ' '\t' | cut -f2 | head -n1"));
+           ("free | grep ':' | tr -s ' ' '\t' | cut -f2 | head -n1"));
     avm += atol(tmp);
     sprintf(command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
@@ -1396 +1396 @@
     log_msg(4, "Done. Great. Seeting command to something");
     strcpy(command,
-           "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+           "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
@@ -1410 +1410 @@
             }
         } else {
-            sprintf(command, "mount | grep -E \"^%s\"", tmp);
+            sprintf(command, "mount | grep -E '^%s'", tmp);
             log_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {
@@ -1486 +1486 @@
            ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
     if (does_file_exist(config_file)) {
-        sprintf(command, "grep -vx '%s .*' %s > %s",
+        sprintf(command, "grep -vE '^%s .*$' %s > %s",
                 label, config_file, tempfile);
         paranoid_system(command);

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