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

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/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-filelist.c (modified) (3 diffs)
• libmondo-raid.c (modified) (1 diff)
• libmondo-tools.c (modified) (3 diffs)
• libmondo-verify.c (modified) (8 diffs)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1025 +1025 @@
 #else
     asprintf(&command,
-            "cat /proc/filesystems | grep -v nodev | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
+            "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -530 +530 @@
   if (find_home_of_exe("setfacl"))
     {
-      sprintf(command, "cat %s | gzip -dc | setfacl --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
+      sprintf(command, "gzip -dc %s | setfacl --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
       log_msg(1, "command = %s", command);
       retval = system(command);
@@ -560 +560 @@
         log_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
-        asprintf(&command, "cat %s | gzip -dc | %s --restore - 2>> %s",
+        asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s",
                  original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
@@ -581 +581 @@
 
     sort_file(masklist);
-    asprintf(&syscall_pin, "cat %s | gzip -dc", original_exat_fname);
+    asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
     asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
              MONDO_LOGFILE);

trunk/mondo/mondo/common/libmondo-raid.c

@@ -49 +49 @@
     if (raidno == -1) {
         asprintf(&command,
-                 "cat /proc/mdstat | grep \"linear\" > /dev/null 2> /dev/null");
+                 "grep \"linear\" /proc/mdstat > /dev/null 2> /dev/null");
     } else {
         asprintf(&command,
-                 "cat /proc/mdstat | grep \"raid%d\" > /dev/null 2> /dev/null",
+                 "grep \"raid%d\" /proc/mdstat > /dev/null 2> /dev/null",
                  raidno);
     }

trunk/mondo/mondo/common/libmondo-tools.c

@@ -172 +172 @@
              "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
 file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
-cat $file.old | awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
-else { print $0;};}' > $file ; fi ; done");
+awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } \
+else { print $0;};}'$file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
     paranoid_free(tmp);
@@ -870 +870 @@
 #ifndef __FreeBSD__
     if (run_program_and_log_output
-        ("cat /proc/devices | grep ramdisk", FALSE)) {
+        ("grep ramdisk /proc/devices", FALSE)) {
         if (!ask_me_yes_or_no
             ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
@@ -1096 +1096 @@
     log_msg(4, "Done. Great. Seeting command to something");
     asprintf(&command,
-             "cat /etc/fstab | grep -v \":\" | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+             "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     asprintf(&tmp, call_program_and_get_last_line_of_output(command));

trunk/mondo/mondo/common/libmondo-verify.c

@@ -63 +63 @@
 
 /*  sprintf (command,
-       "cat %s | grep \"afio: \" | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort | uniq | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
+       "grep \"afio: \" %s | awk '{j=substr($0,8); i=index(j,\": \");printf \"/%%s\\n\",substr(j,1,i-2);}' | sort -u | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"/dev/.*\" > %s",
        stderr_fname, afio_found_changes);
 */
@@ -69 +69 @@
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
     asprintf(&command,
-             "cat %s | grep \"afio: \" | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
+             "grep \"afio: \" %s | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
              stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -80 +80 @@
     log_msg(1, "Now scanning log file for 'star: ' stuff");
     asprintf(&command,
-             "cat %s | grep \"star: \" | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
+             "grep \"star: \" %s | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
              stderr_fname, afio_found_changes);
     log_msg(2, command);
@@ -91 +91 @@
     afio_diffs = count_lines_in_file(afio_found_changes);
     asprintf(&command,
-             "cat %s %s %s | sort | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
+             "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
              ignorefiles_fname, afio_found_changes, afio_found_changes,
              changedfiles_fname);
@@ -308 +308 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (bkpinfo->compression_level > 0) {
-                asprintf(&command, "cat %s | %s -dc 2>> %s",
+                asprintf(&command, "%s -dc %s 2>> %s", sz_exe,
                          slice_fname(bigfile_num, slice_num, mountpoint,
-                                     bkpinfo->zip_suffix), sz_exe,
+                                     bkpinfo->zip_suffix),
                          MONDO_LOGFILE);
             } else {
@@ -448 +448 @@
         asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        asprintf(&command, "cat %s | cut -d':' -f%d | sort | uniq", outlog,
-                 (bkpinfo->use_star) ? 1 : 2);
+        asprintf(&command, "cut -d':' -f%d %s | sort -u",
+                 (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
@@ -489 +489 @@
 
     /*  chdir(old_pwd); */
-    //  sprintf (tmp, "cat %s | uniq -u >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
+    //  sprintf (tmp, "uniq -u %s >> %s", "/tmp/mondo-verify.err", MONDO_LOGFILE);
     //  paranoid_system (tmp);
     //  unlink ("/tmp/mondo-verify.err");
@@ -1084 +1084 @@
              (int) (random() % 32767));
     asprintf(&tmp,
-             "cat %s | grep -x \"%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",
-             MONDO_LOGFILE, (bkpinfo->use_star) ? "star" : "afio",
+             "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",
+             (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE,
              changed_files_fname);
     log_msg(2, "Running command to derive list of changed files");