Changeset 2202 in MondoRescue

Timestamp:

May 13, 2009, 4:34:00 AM (16 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

Location:

branches/2.2.9/mondo

Files:

• Makefile.am (modified) (1 diff)
• configure.in (modified) (1 diff)
• src/common/libmondo-archive.c (modified) (14 diffs)
• src/common/libmondo-cli.c (modified) (4 diffs)
• src/common/libmondo-devices.c (modified) (7 diffs)
• src/common/libmondo-filelist.c (modified) (21 diffs)
• src/common/libmondo-mountlist-EXT.h (modified) (1 diff)
• src/common/libmondo-mountlist.c (modified) (3 diffs)
• src/common/libmondo-mountlist.h (modified) (1 diff)
• src/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• src/mondorestore/mondorestore.c (modified) (3 diffs)
• test (added)
• test/Makefile.am (added)
• test/test-mountlist.c (added)

branches/2.2.9/mondo/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = 1.7
-SUBDIRS        = src
+SUBDIRS        = src test
 man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8

branches/2.2.9/mondo/configure.in

@@ -125 +125 @@
 AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr mkdtemp])
 
-AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile])
+AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile test/Makefile])

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

@@ -803 +803 @@
     }
     if (bkpinfo->backup_media_type == usb) {
-        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+        (void)asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
     } else {
-        asprintf(&tmp2," ");
+        (void)asprintf(&tmp2," ");
     }
 
@@ -828 +828 @@
 
     if (g_getfattr) {
-        asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
+        (void)asprintf(&tmp1, "%s/XATTR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner XATTR",
@@ -836 +836 @@
     }
     if (g_getfacl) {
-        asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
+        (void)asprintf(&tmp1, "%s/ACL", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner ACL",
@@ -844 +844 @@
     }
     if (bkpinfo->use_obdr) {
-        asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        (void)asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner OBDR",
@@ -1581 +1581 @@
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    (void)asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
-    chdir(bkpinfo->scratchdir);
-
-    asprintf(&message_to_screen, "Copying data to make %s #%d",
+    (void)chdir(bkpinfo->scratchdir);
+
+    (void)asprintf(&message_to_screen, "Copying data to make %s #%d",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 g_current_media_number);
     log_msg(1, message_to_screen);
 
-    asprintf(&tmp1, "%s1", bkpinfo->media_device);
+    (void)asprintf(&tmp1, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        asprintf(&tmp, "umount %s", tmp1);
+        (void)asprintf(&tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1601 +1601 @@
 
     log_msg(1, "Mounting USB device.");
-    asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
-    asprintf(&tmp, "mkdir -p %s", tmp1);
+    (void)asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
+    (void)asprintf(&tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     /* Mindi always create one single parition on the USB dev */
-    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
+    (void)asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1616 +1616 @@
 
         /* Command to execute */
-        asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
+        (void)asprintf(&tmp,"mv %s/* %s", bkpinfo->scratchdir, tmp1); 
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {
-            asprintf(&result_sz, "%s ...failed",tmp);
+            (void)asprintf(&result_sz, "%s ...failed",tmp);
         } else {
-            asprintf(&result_sz, "%s ...OK",tmp);
+            (void)asprintf(&result_sz, "%s ...OK",tmp);
         }
         log_to_screen(result_sz);
@@ -1632 +1632 @@
 
     if (is_this_device_mounted(bkpinfo->media_device)) {
-        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        (void)asprintf(&tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     }
 
-    chdir(old_pwd);
+    (void)chdir(old_pwd);
     if (retval) {
         log_msg(1, "WARNING - make_usb_fs returned an error");
@@ -1769 +1769 @@
                     ("Failed to write to disk. I shall blank it and then try again.");
                 sleep(5);
-                system("sync");
+                (void)system("sync");
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
@@ -2398 +2398 @@
     }
 
-    asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+    (void)asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
             biggielist);
     paranoid_system(command);
     paranoid_free(command);
 
-    asprintf(&blah, "biggielist = %s", biggielist);
+    (void)asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
     paranoid_free(blah);
@@ -2413 +2413 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        asprintf(&command, "cp %s %s/archives/", xattr_fname,
+        (void)asprintf(&command, "cp %s %s/archives/", xattr_fname,
             bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2420 +2420 @@
     if (g_getfacl) {
         get_acl_list(biggielist, acl_fname);
-        asprintf(&command, "cp %s %s/archives/", acl_fname,
+        (void)asprintf(&command, "cp %s %s/archives/", acl_fname,
              bkpinfo->scratchdir);
         paranoid_system(command);
@@ -2428 +2428 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
-        asprintf(&blah, "%ld", count_lines_in_file(biggielist));
+        (void)asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
         paranoid_free(blah);
@@ -3555 +3555 @@
                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
                 MONDO_LOGFILE, MONDO_CACHE);
-        system(tmp);
+        (void)system(tmp);
 
         sprintf(tmp,
                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
                 MONDO_LOGFILE, MONDO_CACHE);
-        system(tmp);
+        (void)system(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
 //    if (bkpinfo->backup_media_type != iso && !bkpinfo->please_dont_eject_when_restoring)

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

@@ -1444 +1444 @@
     /*@ ints ** */
     int opt = 0;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     int i = 0;
     int len;
@@ -1467 +1467 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                sprintf(tmp, "Switch -%c previously defined as %s\n", opt,
+                (void) asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
                         flag_val[i]);
                 log_to_screen(tmp);
+                paranoid_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -1483 +1484 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            sprintf(tmp,
+                            (void)asprintf(&tmp,
                                     "-%c flag --- must be absolute path --- '%s' isn't absolute",
                                     opt, flag_val[opt]);
                             log_to_screen(tmp);
+                            paranoid_free(tmp);
                             bad_switches = TRUE;
                         }
@@ -1497 +1499 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        sprintf(tmp, "Invalid arg -- %s\n", argv[i]);
+        (void)asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
         log_to_screen(tmp);
+        paranoid_free(tmp);
     }
     return (bad_switches);

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

@@ -664 +664 @@
         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)) {
         p = strchr(tmp, '\'');
         if (p) {
@@ -698 +698 @@
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
-            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)) {
                 log_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
@@ -1141 +1141 @@
         return (FALSE);
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for ((void)fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
+         (void)fgets(incoming, MAX_STR_LEN - 1, fin)) {
         if (strstr(incoming, device_with_space) //> incoming
             || strstr(incoming, device_with_tab))   // > incoming)
@@ -1399 +1399 @@
         }
         sprintf(tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
-        system(tmp);
+        (void)system(tmp);
         sprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir, bkpinfo->prefix,
@@ -1813 +1813 @@
         if (bkpinfo->disaster_recovery) {
             sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
-            system(command);
+            (void)system(command);
             if (!popup_and_get_string
                 ("NFS share", "Which remote NFS share should I mount?",
@@ -2452 +2452 @@
         return ('\0');
     }
-    for (fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-         fgets(current_drive, MAX_STR_LEN, pdrives)) {
+    for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
+         (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
         strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
@@ -2490 +2490 @@
             return ('\0');
         }
-        for (fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-            fgets(current_drive, MAX_STR_LEN, pdrives)) {
+        for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
+            (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
             strip_spaces(current_drive);
             log_it("looking at partition %s's BR", current_drive);

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;

branches/2.2.9/mondo/src/common/libmondo-mountlist-EXT.h

@@ -8 +8 @@
 extern int look_for_duplicate_mountpoints(struct mountlist_itself
                                           *mountlist, char *flaws_str);
-extern int look_for_weird_formats(struct mountlist_itself *mountlist,
-                                  char *flaws_str);
 extern int make_list_of_drives_in_mountlist(struct mountlist_itself *,
                                             struct list_of_disks *);

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

@@ -508 +508 @@
     /*@ buffer *********************************************************** */
     struct list_of_disks *drivelist;
-    char *tmp;
-    char *flaws_str;
+    char *tmp = NULL;
+    char *flaws_str = NULL;
 
     /*@ int ************************************************************** */
@@ -547 +547 @@
     }
     res += look_for_duplicate_mountpoints(mountlist, flaws_str);
-/*  res+=look_for_weird_formats(mountlist,flaws_str); .. not necessary, now that we can check to see
- which formarts are actually _supported_ by the kernel */
-    /* log_it(flaws_str); */
     return (spread_flaws_across_three_lines
             (flaws_str, flaws_str_A, flaws_str_B, flaws_str_C, res));
@@ -644 +641 @@
     return (res);
 }
-
-/**
- * Look for strange formats. Does not respect /proc/filesystems.
- * @param mountlist The mountlist to check.
- * @param flaws_str The flaws string to append the results to.
- * @return The number of weird formats found, or 0 for success.
- * @bug Seems orphaned; please remove.
- */
-int
-look_for_weird_formats(struct mountlist_itself *mountlist, char *flaws_str)
-{
-
-    /*@ int ************************************************************* */
-    int i = 0;
-    int res = 0;
-
-    /*@ buffers ********************************************************* */
-    char *tmp;
-    char *format_sz;
-
-    malloc_string(tmp);
-    malloc_string(format_sz);
-
-    assert(mountlist != NULL);
-    assert(flaws_str != NULL);
-
-    for (i = 0; i < mountlist->entries; i++) {
-        sprintf(format_sz, " %s ", mountlist->el[i].format);
-        if (!strstr(SANE_FORMATS, format_sz)
-            && strcmp(mountlist->el[i].mountpoint, "image") != 0) {
-            sprintf(tmp, " %s has unknown format.",
-                    mountlist->el[i].device);
-            log_it(tmp);
-            strcat(flaws_str, tmp);
-            res++;
-        } else if ((!strcmp(mountlist->el[i].format, "swap")
-                    && strcmp(mountlist->el[i].mountpoint, "swap")
-                    && strcmp(mountlist->el[i].mountpoint, "none"))
-                   || (strcmp(mountlist->el[i].format, "swap")
-                       && !strcmp(mountlist->el[i].mountpoint, "swap")
-                       && !strcmp(mountlist->el[i].mountpoint, "none"))) {
-            sprintf(tmp, " %s is half-swap.", mountlist->el[i].device);
-            log_it(tmp);
-            strcat(flaws_str, tmp);
-            res++;
-        }
-    }
-    paranoid_free(tmp);
-    paranoid_free(format_sz);
-    return (res);
-}
-
 
 

branches/2.2.9/mondo/src/common/libmondo-mountlist.h

@@ -11 +11 @@
 int look_for_duplicate_mountpoints(struct mountlist_itself *mountlist,
                                    char *flaws_str);
-int look_for_weird_formats(struct mountlist_itself *mountlist,
-                           char *flaws_str);
 int make_list_of_drives_in_mountlist(struct mountlist_itself *,
                                      struct list_of_disks *);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -149 +149 @@
 void log_to_screen(const char *fmt, ...);
 int look_for_duplicate_mountpoints(struct mountlist_itself *, char *);
-int look_for_weird_formats(struct mountlist_itself *, char *);
 void make_list_of_unallocated_raid_partitions(struct mountlist_itself *,
                                               struct mountlist_itself *,

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -2880 +2880 @@
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
 
-    malloc_string(tmp);
     malloc_string(a);
     malloc_string(b);
@@ -2926 +2925 @@
 
     /* Init GUI */
-    malloc_libmondo_global_strings();
     setup_newt_stuff();         /* call newtInit and setup screen log */
     welcome_to_mondorestore();
@@ -2955 +2953 @@
     }
 
-    g_loglevel = DEFAULT_MR_LOGLEVEL;
     if (argc == 3 && strcmp(argv[1], "--echo-to-screen") == 0) {
         fout = fopen("/tmp/out.txt", "w");