Changeset 273 in MondoRescue for branches/2.06/mondo/mondo/common

Timestamp:

Jan 3, 2006, 4:09:12 PM (18 years ago)

Author:

bcornec

Message:

Patches from Sébastien Aperghis-Tramoni <maddingue@…>

replace several occurences of "cat .. | grep .."
or with similar commands that accept filenames as arguments.
+ some sort | uniq replaced by sort -u

Location:

branches/2.06/mondo/mondo/common

Files:

• X-specific.cpp (modified) (2 diffs)
• libmondo-devices.c (modified) (1 diff)
• libmondo-filelist.c (modified) (4 diffs)
• libmondo-files.c (modified) (1 diff)
• libmondo-raid.c (modified) (1 diff)
• libmondo-tools.c (modified) (3 diffs)
• libmondo-verify.c (modified) (8 diffs)
• newt-specific.c (modified) (1 diff)

branches/2.06/mondo/mondo/common/X-specific.cpp

@@ -197 +197 @@
     kapp->quit();
     printf ("---FATAL ERROR--- %s\n", error);
-    system ("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
+    system ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
     printf ("If you require technical support, please contact the mailing list.\n");
     printf ("See http://www.mondorescue.org for details.\n");
@@ -252 +252 @@
   if (grep_for_me[0] != '\0')
     {
-      sprintf (command, "cat %s | grep \"%s\" | tail -n%d", filename,
-           grep_for_me, NOOF_ERR_LINES);
+      sprintf (command, "grep \"%s\" %s | tail -n%d", 
+           grep_for_me, filename, NOOF_ERR_LINES);
     }
   else
     {
-      sprintf (command, "cat %s | tail -n%d", filename, NOOF_ERR_LINES);
+      sprintf (command, "tail -n%d %s", NOOF_ERR_LINES, filename);
     }
   fin = popen (command, "r");

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

@@ -1437 +1437 @@
 #else
     sprintf(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
 

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

@@ -656 +656 @@
   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);
@@ -685 +685 @@
         log_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
-        sprintf(command, "cat %s | gzip -dc | %s --restore - 2>> %s",
+        sprintf(command, "gzip -dc %s | %s --restore - 2>> %s",
                 original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
@@ -712 +712 @@
     sort_file(masklist);
     current_subset_file[0] = current_master_file[0] = '\0';
-    sprintf(syscall_pin, "cat %s | gzip -dc", original_exat_fname);
+    sprintf(syscall_pin, "gzip -dc %s", original_exat_fname);
     sprintf(syscall_pout, "%s --restore - 2>> %s", executable,
             MONDO_LOGFILE);
@@ -833 +833 @@
   if (find_home_of_exe("setfattr"))
     {
-      sprintf(command, "cat %s | gzip -dc | setfattr --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
+      sprintf(command, "gzip -dc %s | setfattr --restore - 2>> %s", acl_fname, MONDO_LOGFILE);
       log_msg(1, "command = %s", command);
       retval = system(command);

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

@@ -845 +845 @@
     sprintf(mountlist, "%s/mountlist.txt", tmpdir);
     sprintf(command,
-            "cat %s/mountlist.txt | grep \"%s \" | head -n1 | awk '{print $4;}'",
-            tmpdir, dev);
+            "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'",
+            dev, tmpdir);
     log_it(command);
     strcpy(sz_res, call_program_and_get_last_line_of_output(command));

branches/2.06/mondo/mondo/common/libmondo-raid.c

@@ -80 +80 @@
 
     command = malloc(MAX_STR_LEN * 2);
-    strcpy(command, "cat /proc/mdstat | grep \"");
+    strcpy(command, "grep \" /proc/mdstat");
     if (raidno == -1) {
         strcat(command, "linear");

branches/2.06/mondo/mondo/common/libmondo-tools.c

@@ -335 +335 @@
            "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);
@@ -1098 +1098 @@
 #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?"))
@@ -1390 +1390 @@
     log_msg(4, "Done. Great. Seeting command to something");
     strcpy(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);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));

branches/2.06/mondo/mondo/common/libmondo-verify.c

@@ -159 +159 @@
 
 /*  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);
 */
@@ -165 +165 @@
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
     sprintf(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);
@@ -175 +175 @@
     log_msg(1, "Now scanning log file for 'star: ' stuff");
     sprintf(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);
@@ -185 +185 @@
     afio_diffs = count_lines_in_file(afio_found_changes);
     sprintf(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);
@@ -401 +401 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (bkpinfo->compression_level > 0) {
-                sprintf(command, "cat %s | %s -dc 2>> %s",
+                sprintf(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 {
@@ -543 +544 @@
         sprintf(command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        sprintf(command, "cat %s | cut -d':' -f%d | sort | uniq", outlog,
-                (bkpinfo->use_star) ? 1 : 2);
+        sprintf(command, "cut -d: -f%d %s | sort -u",
+                (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
@@ -580 +581 @@
     }
     /*  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");
@@ -1148 +1149 @@
             (int) (random() % 32767));
     sprintf(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");

branches/2.06/mondo/mondo/common/newt-specific.c

@@ -424 +424 @@
         printf("---FATALERROR--- %s\n", error_string);
         system
-            ("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
+            ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
         printf
                 ("If you require technical support, please contact the mailing list.\n");