Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-filelist.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/libmondo-filelist.c (modified) (13 diffs)

branches/2.2.9/mondo/src/common/libmondo-filelist.c

@@ -18 +18 @@
 #include "libmondo-tools-EXT.h"
 #include "mr_string.h"
+#include "mr_mem.h"
 
 #include <time.h>
@@ -484 +485 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
-        (void)asprintf(&strtmp, syscall_sprintf, tmp);
+        mr_asprintf(&strtmp, syscall_sprintf, tmp);
         paranoid_free(tmp);
-        (void)asprintf(&syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
+        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);  // " MONDO_LOGFILE);
         paranoid_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -1389 +1390 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        (void)asprintf(&find_excludes, " ");
+        mr_asprintf(&find_excludes, " ");
         while((token = mr_strtok (sth, delims, &lastpos))) {
-          (void)asprintf(&strtmp,"%s", find_excludes);
+          mr_asprintf(&strtmp,"%s", find_excludes);
           paranoid_free(find_excludes);
-          (void)asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
           paranoid_free(strtmp);
           paranoid_free(token);
@@ -1399 +1400 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        (void)asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
              dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        (void)asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
                 dir, find_excludes, g_skeleton_filelist);
@@ -1412 +1413 @@
         (void)system(strtmp);
         paranoid_free(strtmp);
-        (void)asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =
             1 + atol(call_program_and_get_last_line_of_output(tmp));
@@ -1442 +1443 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    (void)asprintf(&tmp, "Reading %-68s", dir);
+                    mr_asprintf(&tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);
@@ -1456 +1457 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        (void)asprintf(&skip_these, "%s", sth);
+        mr_asprintf(&skip_these, "%s", sth);
     } else {
-        (void)asprintf(&skip_these, " %s ", sth);
-    }
-    (void)asprintf(&new_with_spaces, " %s ", dir);
+        mr_asprintf(&skip_these, " %s ", sth);
+    }
+    mr_asprintf(&new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        (void)asprintf(&tmp,"opendir %s", dir);
+        mr_asprintf(&tmp,"opendir %s", dir);
         log_OS_error(tmp);
         paranoid_free(tmp);
@@ -1472 +1473 @@
             i++;
             if (strcmp(dir, "/")) {
-                (void)asprintf(&new,"%s/%s",dir,dit->d_name);
+                mr_asprintf(&new,"%s/%s",dir,dit->d_name);
             } else {
-                (void)asprintf(&new,"%s%s",dir,dit->d_name);
+                mr_asprintf(&new,"%s%s",dir,dit->d_name);
             }
             paranoid_free(new_with_spaces);
-            (void)asprintf(&new_with_spaces, " %s ", new);
+            mr_asprintf(&new_with_spaces, " %s ", new);
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1496 +1497 @@
                                 counter = 0;
                                 uberctr++;
-                                (void)asprintf(&tmp, " %c ",
+                                mr_asprintf(&tmp, " %c ",
                                         special_dot_char(uberctr));
 #ifndef _XWIN
@@ -1550 +1551 @@
     bool in_quotes = FALSE;
 
-    (void)asprintf(&sz_res, "%s", incoming);
+    mr_asprintf(&sz_res, "%s", incoming);
     p = sz_res;
     while ((*p != ' ' || in_quotes) && *p != '\0') {
@@ -1598 +1599 @@
         fatal_error("Cannot malloc exclude_paths");
     }
-    (void)asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1606 +1607 @@
     sprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    (void)asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
     make_hole_for_file(sz_filelist);
 
@@ -1646 +1647 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        (void)asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
         if (strlen(tmp2) < 1) {
-            (void)asprintf(&tmp1," ");
+            mr_asprintf(&tmp1," ");
         } else {
             log_msg(2, "Found windows FS: %s",tmp2);
-            (void)asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             paranoid_free(tmp2);
-            (void)asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }