Changeset 681 in MondoRescue for branches/stable

Timestamp:

Jun 25, 2006, 4:41:57 AM (18 years ago)

Author:

andree

Message:

Replaced all occurrences of egrep with 'grep -E' and of fgrep with
'grep -F' in mondo.
egrep and fgrep are usually just script wrappers around grep these
days which means additional overhead compared to calling grep with the
relevant option. Also, it appears that egrep and fgrep have been
deprecated by POSIX some time ago.

Location:

branches/stable/mondo/mondo

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-fifo.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-files.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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

@@ -1897 +1897 @@
                 log_to_screen("%s...OK", message_to_screen);
                 if (!run_program_and_log_output
-                    ("tail -n10 /var/log/mondo-archive.log | fgrep ':-('",
+                    ("tail -n10 /var/log/mondo-archive.log | grep -F ':-('",
                      1)) {
                     log_to_screen

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

@@ -525 +525 @@
     return
         !system
-        ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | egrep -qv '(MS|DOS|FAT|NTFS)'");
+        ("parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|FAT|NTFS)'");
 #endif
 }

branches/stable/mondo/mondo/common/libmondo-fifo.c

@@ -242 +242 @@
     paranoid_system("sync");
     sprintf(command,
-            "ps wwax | fgrep \"%s\" | fgrep -v grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
+            "ps wwax | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'",
             g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);

branches/stable/mondo/mondo/common/libmondo-filelist.c

@@ -1546 +1546 @@
     {
         sprintf(find_skeleton_marker,
-                "fgrep -v \"%s\" %s > %s.new 2> /dev/null", dir,
+                "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_skeleton_filelist);
 //    log_msg(0, "fsm = %s", find_skeleton_marker);

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

@@ -520 +520 @@
     if (i < 0) {
         sprintf(command,
-                "tail -n3 %s | fgrep -i \"%c\" | tail -n1 | awk '{print $0;}'",
+                "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
                 filename, '%');
         strcpy(lastline,

branches/stable/mondo/mondo/mondoarchive/mondo-cli.c

@@ -920 +920 @@
         &&
         !run_program_and_log_output
-        ("egrep -i suse /etc/issue.net | egrep '9.0' | grep 64", TRUE)) {
+        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", TRUE)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen

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

@@ -1819 +1819 @@
         log_msg(0,
                 "------------------- end of fdisk.log... word! ------------------");
-        sprintf(tmp, "tail -n6 %s | fgrep \"16: \"", FDISK_LOG);
+        sprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up++;

branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -720 +720 @@
     }
 
-    if (!run_program_and_log_output("mount | fgrep " MNT_CDROM, FALSE)) {
+    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
         log_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
         paranoid_free(mount_cmd);