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

Timestamp:

May 13, 2009, 4:34:00 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove useless function look_for_weird_formats
• Adds a test program for mountlist management to find a seg. fault bug when using a large mountlist file

File:

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

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

@@ -440 +440 @@
     }
     malloc_string(tmp);
-    for (fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
-         fgets(tmp, MAX_STR_LEN, pattr)) {
+    for ((void)fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
+         (void)fgets(tmp, MAX_STR_LEN, pattr)) {
         fputs(tmp, pout);
     }
@@ -476 +476 @@
     }
     malloc_string(file_to_analyze);
-    for (fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
-         fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    for ((void)fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
+         (void)fgets(file_to_analyze, MAX_STR_LEN, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -484 +484 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         tmp = mr_stresc(file_to_analyze, "`$\\\"()\'|", '\\');
-        asprintf(&strtmp, syscall_sprintf, tmp);
+        (void)asprintf(&strtmp, syscall_sprintf, tmp);
         paranoid_free(tmp);
-        asprintf(&syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE);
+        (void)asprintf(&syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
         paranoid_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -609 +609 @@
 //  printf("Hi there. Starting the loop\n");
 
-    fgets(current_subset_file, MAX_STR_LEN, faclin);
-    fgets(incoming, MAX_STR_LEN, pin);
+    (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+    (void)fgets(incoming, MAX_STR_LEN, pin);
     while (!feof(pin) && !feof(faclin)) {
 //      printf("incoming = %s", incoming);
@@ -642 +642 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            fgets(current_subset_file, MAX_STR_LEN, faclin);
+            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
             continue;
         }
@@ -649 +649 @@
             fputs(incoming, pout);
         }
-        fgets(incoming, MAX_STR_LEN, pin);
+        (void)fgets(incoming, MAX_STR_LEN, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
@@ -662 +662 @@
                 fputs(incoming, pout);
             }
-            fgets(incoming, MAX_STR_LEN, pin);
+            (void)fgets(incoming, MAX_STR_LEN, pin);
         }
         if (!i) {
-            fgets(current_subset_file, MAX_STR_LEN, faclin);
+            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
         }
     }
     while (!feof(pin)) {
-        fgets(incoming, MAX_STR_LEN, pin);
+        (void)fgets(incoming, MAX_STR_LEN, pin);
     }
     fclose(faclin);
@@ -916 +916 @@
     }
     open_evalcall_form("Loading filelist from disk");
-    for (fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         fgets(fname, MAX_STR_LEN, pin)) {
+    for ((void)fgets(fname, MAX_STR_LEN, pin); !feof(pin);
+         (void)fgets(fname, MAX_STR_LEN, pin)) {
         if ((fname[strlen(fname) - 1] == 13
              || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
@@ -1389 +1389 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        asprintf(&find_excludes, " ");
+        (void)asprintf(&find_excludes, " ");
         while((token = mr_strtok (sth, delims, &lastpos))) {
-          asprintf(&strtmp,"%s", find_excludes);
+          (void)asprintf(&strtmp,"%s", find_excludes);
           paranoid_free(find_excludes);
-          asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          (void)asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
           paranoid_free(strtmp);
           paranoid_free(token);
@@ -1399 +1399 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        asprintf(&strtmp,
+        (void)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
-        asprintf(&strtmp,
+        (void)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);
@@ -1410 +1410 @@
         paranoid_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
-        system(strtmp);
+        (void)system(strtmp);
         paranoid_free(strtmp);
-        asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        (void)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 +1442 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    asprintf(&tmp, "Reading %-68s", dir);
+                    (void)asprintf(&tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);
@@ -1456 +1456 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        asprintf(&skip_these, "%s", sth);
+        (void)asprintf(&skip_these, "%s", sth);
     } else {
-        asprintf(&skip_these, " %s ", sth);
-    }
-    asprintf(&new_with_spaces, " %s ", dir);
+        (void)asprintf(&skip_these, " %s ", sth);
+    }
+    (void)asprintf(&new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        asprintf(&tmp,"opendir %s", dir);
+        (void)asprintf(&tmp,"opendir %s", dir);
         log_OS_error(tmp);
         paranoid_free(tmp);
@@ -1472 +1472 @@
             i++;
             if (strcmp(dir, "/")) {
-                asprintf(&new,"%s/%s",dir,dit->d_name);
+                (void)asprintf(&new,"%s/%s",dir,dit->d_name);
             } else {
-                asprintf(&new,"%s%s",dir,dit->d_name);
+                (void)asprintf(&new,"%s%s",dir,dit->d_name);
             }
             paranoid_free(new_with_spaces);
-            asprintf(&new_with_spaces, " %s ", new);
+            (void)asprintf(&new_with_spaces, " %s ", new);
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1496 +1496 @@
                                 counter = 0;
                                 uberctr++;
-                                asprintf(&tmp, " %c ",
+                                (void)asprintf(&tmp, " %c ",
                                         special_dot_char(uberctr));
 #ifndef _XWIN
@@ -1550 +1550 @@
     bool in_quotes = FALSE;
 
-    asprintf(&sz_res, "%s", incoming);
+    (void)asprintf(&sz_res, "%s", incoming);
     p = sz_res;
     while ((*p != ' ' || in_quotes) && *p != '\0') {
@@ -1598 +1598 @@
         fatal_error("Cannot malloc exclude_paths");
     }
-    asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    (void)asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1606 +1606 @@
     sprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    (void)asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
     make_hole_for_file(sz_filelist);
 
@@ -1646 +1646 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        (void)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) {
-            asprintf(&tmp1," ");
+            (void)asprintf(&tmp1," ");
         } else {
             log_msg(2, "Found windows FS: %s",tmp2);
-            asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            (void)asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             paranoid_free(tmp2);
-            asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            (void)asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }
@@ -1813 +1813 @@
 //      fscanf(fin, "%s\n", fname);
         len = MAX_STR_LEN - 1;
-        getline(&fname, &len, fin); // patch by Scrub
+        (void)getline(&fname, &len, fin);   // patch by Scrub
         if (!use_star) {
             if (fname[0] == '/') {
@@ -1883 +1883 @@
         return (1);
     }
-    for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         fgets(tmp, MAX_STR_LEN, fin)) {
+    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
+         (void)fgets(tmp, MAX_STR_LEN, fin)) {
         if (!tmp[0]) {
             continue;