Changeset 911 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.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-tools.c (modified) (4 diffs)

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