Changeset 274 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

Jan 3, 2006, 4:15:54 PM (18 years ago)

Author:

bcornec

Message:

merge -r272:273 $SVN_M/branches/2.06

Location:

trunk/mondo/mondo/mondorestore

Files:

• mondo-restore.c (modified) (2 diffs)
• mondo-rstr-newt.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (4 diffs)

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -3101 +3101 @@
     fatal_error("This will fail");
     sprintf(command,
-            "cat %s | grep -x \"%s.*\" > %s",
-            g_filelist_full, restore_this_directory, g_filelist_full);
+            "grep -x \"%s.*\" %s > %s",
+            restore_this_directory, g_filelist_full, g_filelist_full);
     if (system(command)) {
         retval++;
@@ -3111 +3111 @@
     fatal_error("This will fail");
     sprintf(command,
-            "cat %s | grep -x \"%s.*\" > %s",
-            g_biggielist_txt, restore_this_directory, g_biggielist_txt);
+            "grep -x \"%s.*\" %s > %s",
+            restore_this_directory, g_biggielist_txt, g_biggielist_txt);
     if (system(command)) {
         log_msg(1,

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -553 +553 @@
     assert(raidrec != NULL);
     system
-        ("cat /proc/mdstat | grep Pers > /tmp/raid-personalities.txt 2> /dev/null");
+        ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
     strcpy(personalities,
            last_line_of_file("/tmp/raid-personalities.txt"));

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -382 +382 @@
             f, file);
     log_msg(2, tmp);
-    sprintf(command, "cat %s | grep -x \"%s\"", list_fname, file);
+    sprintf(command, "grep -x \"%s\" %s", file, list_fname);
     res = run_program_and_log_output(command, FALSE);
     paranoid_free(command);
@@ -540 +540 @@
     }
     sprintf(newfile_fname, "%s/rc.local.mondorescue", path);
-    sprintf(tmp, "cat %s | grep mondorescue > /dev/null 2> /dev/null",
+    sprintf(tmp, "grep mondorescue %s > /dev/null 2> /dev/null",
             rclocal_fname);
     if (system(tmp)) {
@@ -551 +551 @@
 \\n\
 \\n\
-cat %s | grep -v mondorescue > %s\\n\
+grep -v mondorescue %s > %s\\n\
 rm -f /var/lock/subsys/*xfs*\\n\
 rm -f /var/run/xfs.*\\n\
@@ -1353 +1353 @@
             paranoid_system(command);
         }
-        sprintf(command, "cat %s | grep  -x \"/dev/.*\" > %s",
+        sprintf(command, "grep  -x \"/dev/.*\" %s > %s",
                 g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);