Changeset 2357 in MondoRescue

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

Location:

branches/2.2.10

Files:

• mondo/src/common/libmondo-archive.c (modified) (8 diffs)
• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (9 diffs)
• mondo/src/common/libmondo-files.c (modified) (28 diffs)
• mondo/src/common/libmondo-fork.c (modified) (8 diffs)
• mondo/src/common/libmondo-gui-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-gui.c (modified) (1 diff)
• mondo/src/common/libmondo-gui.h (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (6 diffs)
• mondo/src/common/libmondo-raid.c (modified) (5 diffs)
• mondo/src/common/libmondo-tools.c (modified) (3 diffs)
• mondo/src/common/libmondo-verify.c (modified) (7 diffs)
• mondo/src/common/newt-specific.c (modified) (19 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (26 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (7 diffs)
• tools/quality (modified) (1 diff)

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

@@ -227 +227 @@
         log_msg(5, "command='%s'", command);
         res = system(command);
-        mr_asprintf(tmp, "%s", last_line_of_file(MONDO_LOGFILE));
+        tmp = last_line_of_file(MONDO_LOGFILE);
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -558 +558 @@
 
     mr_asprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(last_filelist_number, "%s", last_line_of_file(tmp));
+    last_filelist_number = last_line_of_file(tmp);
     mr_free(tmp);
 
@@ -2034 +2034 @@
             res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream((off_t)0, calc_checksum_of_file(bigfile_fname), BLK_STOP_A_BIGGIE);
+                tmp = calc_checksum_of_file(bigfile_fname);
+                write_header_block_to_stream((off_t)0, tmp, BLK_STOP_A_BIGGIE);
+                mr_free(tmp);
             }
             retval += res;
@@ -2049 +2051 @@
         }
         mr_free(bigfile_fname);
-#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-#endif
         mr_free(tmp);
     }
@@ -2654 +2654 @@
             mr_free(mds);
 
-            cd_number = atoi(last_line_of_file(szcdno));
+            tmp = last_line_of_file(szcdno);
+            cd_number = atoi(tmp);
+            mr_free(tmp);
+
             mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
@@ -2982 +2985 @@
                 mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
             }
-#ifndef _XWIN
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -2989 +2991 @@
                 log_msg(2, tmp);
             }
-#else
-            log_msg(2, tmp);
-#endif
             mr_free(tmp);
 
@@ -3111 +3110 @@
     log_msg(2, tmp);
     center_string(tmp, 80);
-#ifndef _XWIN
     if (!g_text_mode) {
         newtPushHelpLine(tmp);
     }
-#endif
     res = write_iso_and_go_on(TRUE);
-#ifndef _XWIN
     if (!g_text_mode) {
         newtPopHelpLine();
     }
-#endif
     log_msg(2, "Returning from writing final ISO (res=%d)", res);
     paranoid_free(tmp);

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

@@ -2185 +2185 @@
         mr_asprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
         mr_asprintf(mountdev, "%s%s", call_program_and_get_last_line_of_output(tmp), "/archives/THIS-CD-NUMBER");
-        cd_number = atoi(last_line_of_file(mountdev));
+        mr_free(tmp);
+
+        tmp = last_line_of_file(mountdev);
+        cd_number = atoi(tmp);
+        mr_free(tmp);
         mr_free(mountdev);
-        mr_free(tmp);
-
         return (cd_number);
     }
@@ -2210 +2212 @@
     mr_free(mountdev);
 
-    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
+    tmp = last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER");
+    cd_number = atoi(tmp);
+    mr_free(tmp);
     return (cd_number);
 }

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

@@ -346 +346 @@
        then update_progress_form() won't show the "time taken / time remaining"
        line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
-#ifndef _XWIN
     if (!g_text_mode) {
         open_progress_form("", "", "", "", 100);
@@ -353 +352 @@
         newtPopWindow();
     }
-#endif
     return (err ? 0 : curr_set_no + 1);
 }
@@ -471 +469 @@
         tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
         mr_asprintf(strtmp, syscall_sprintf, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
+
         mr_asprintf(syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
         mr_free(strtmp);
+
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
@@ -927 +927 @@
         }
         add_string_at_node(filelist, fname);
-        mr_free(fname);
 
         if (!(++lino % 1111)) {
@@ -933 +932 @@
             update_evalcall_form(percentage);
         }
+        mr_free(fname);
     }
     mr_free(fname);
@@ -1414 +1414 @@
             if (this_time != last_time) {
                 last_time = this_time;
-#ifndef _XWIN
                 if (!g_text_mode) {
                     mr_asprintf(tmp, "Reading %-68s", dir);
@@ -1420 +1419 @@
                     mr_free(tmp);
                 }
-#endif
                 update_evalcall_form(percentage);
             }
@@ -1468 +1466 @@
                                 counter = 0;
                                 uberctr++;
-#ifndef _XWIN
                                 mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
                                 if (!g_text_mode) {
@@ -1475 +1472 @@
                                 }
                                 mr_free(tmp);
-#endif
                             }
                         }

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -46 +46 @@
 {
     /*@ buffers ***************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
     char *command = NULL;
 
     /*@ pointers **************************************************** */
-    char *p;
+    char *p = NULL;
     FILE *fin;
-
-    /*@ initialize pointers ***************************************** */
-
-    p = output;
 
     /*@************************************************************** */
@@ -64 +60 @@
         fin = popen(command, "r");
         if (fin) {
-            (void) fgets(output, MAX_STR_LEN, fin);
+            mr_getline(output, fin);
             p = strchr(output, ' ');
+            if (p != NULL) {
+                *p = '\0';
+            } else {
+                mr_free(output);
+                mr_asprintf(output, "");
+            }
             paranoid_pclose(fin);
         }
@@ -71 +73 @@
     } else {
         log_it("File '%s' not found; cannot calc checksum", filename);
-    }
-    if (p) {
-        *p = '\0';
+        mr_asprintf(output, "");
     }
     return (output);
@@ -125 +125 @@
     /*@ buffers ***************************************************** */
     char *command = NULL;
-    char incoming[MAX_STR_LEN];
+    char *incoming = NULL;
 
     /*@ long ******************************************************** */
@@ -132 +132 @@
     /*@ pointers **************************************************** */
     FILE *fin;
-
-    /*@ initialize [0] to null ******************************************** */
-    incoming[0] = '\0';
 
     assert_string_is_neither_NULL_nor_zerolength(filename);
@@ -152 +149 @@
             noof_lines = 0;
         } else {
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-            while (strlen(incoming) > 0
-                   && incoming[strlen(incoming) - 1] < 32) {
+            mr_getline(incoming, fin);
+            while (strlen(incoming) > 0 && incoming[strlen(incoming) - 1] < 32) {
                 incoming[strlen(incoming) - 1] = '\0';
             }
             noof_lines = atol(incoming);
+            mr_free(incoming);
         }
         paranoid_pclose(fin);
@@ -206 +203 @@
     char *outfname = NULL;
     char *tmp = NULL;
-    char incoming[MAX_STR_LEN];
+    char *incoming = NULL;
 
     /*@ int ********************************************************* */
@@ -236 +233 @@
     mr_free(outfname);
 
-    for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -247 +243 @@
             log_it("Excluding '%s'-nonexistent\n", incoming);
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
+
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -470 +469 @@
 {
     /*@ buffers ***************************************************** */
-    static char output[MAX_STR_LEN];
+    char *output = NULL;
     char *command = NULL;
 
@@ -480 +479 @@
     if (!does_file_exist(filename)) {
         log_it("Tring to get last line of nonexistent file (%s)", filename);
-        output[0] = '\0';
+        mr_asprintf(output, "");
         return (output);
     }
@@ -487 +486 @@
     mr_free(command);
 
-    (void) fgets(output, MAX_STR_LEN, fin);
+    mr_getline(output, fin);
     paranoid_pclose(fin);
     while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
@@ -526 +525 @@
  * @bug I don't know what this function does. However, it seems orphaned, so it should probably be removed.
  */
-int
-make_checksum_list_file(char *filelist, char *cksumlist, char *comppath)
-{
+int make_checksum_list_file(char *filelist, char *cksumlist, char *comppath) {
     /*@ pointers **************************************************** */
     FILE *fin;
@@ -539 +536 @@
 
     /*@ buffer ****************************************************** */
-    char stub_fname[1000];
-    char curr_fname[1000];
+    char *stub_fname = NULL;
+    char *curr_fname = NULL;
     char *curr_cksum = NULL;
     char *tmp = NULL;
@@ -571 +568 @@
         return (1);
     }
-    for (fgets(stub_fname, 999, fin); !feof(fin);
-         fgets(stub_fname, 999, fin)) {
+    for (mr_getline(stub_fname, fin); !feof(fin); mr_getline(stub_fname, fin)) {
         if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
             stub_fname[i] = '\0';
         }
         mr_asprintf(tmp, "%s%s", comppath, stub_fname);
-        strcpy(curr_fname, tmp + 1);
+        mr_free(stub_fname);
+
+        mr_asprintf(curr_fname, "%s", tmp + 1);
         mr_free(tmp);
 
@@ -587 +585 @@
             current_time = get_time();
             counter = 0;
+            /* BERLIOS: 37 really ? */
             curr_fname[37] = '\0';
             curr_pos = ftello(fin) / 1024;
             percentage = (int) (curr_pos * 100 / filelist_length);
             time_taken = current_time - start_time;
-            if (percentage == 0) {
-                /*              printf("%0d%% done      \r",percentage); */
-            } else {
+            if (percentage != 0) {
                 time_remaining = time_taken * 100 / (long) (percentage) - time_taken;
                 log_to_screen("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
@@ -599 +596 @@
             sync();
         }
-    }
+        mr_free(curr_fname);
+    }
+    mr_free(stub_fname);
+
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -678 +678 @@
 
     /*@ buffers **************************************************** */
-    char incoming[MAX_STR_LEN];
+    char *incoming = NULL;
 
     /*@ end vars *************************************************** */
@@ -689 +689 @@
         return (0);
     }
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+    mr_getline(incoming, fin);
     while (!feof(fin)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-    }
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
     paranoid_fclose(fin);
     return (matches);
@@ -737 +739 @@
 {
     /*@ buffers ***************************************************** */
-    char *fname;
+    char *fname = NULL;
     char *biggielist = NULL;
     char *tmp = NULL;
@@ -751 +753 @@
     /*@ end vars *************************************************** */
 
-    malloc_string(fname);
     log_it("Calculating size of all biggiefiles (in total)");
     mr_asprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
@@ -762 +763 @@
     } else {
         log_msg(4, "Reading it...");
-        for (fgets(fname, MAX_STR_LEN, fin); !feof(fin);
-             fgets(fname, MAX_STR_LEN, fin)) {
+        for (mr_getline(fname, fin); !feof(fin); mr_getline(fname, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -772 +772 @@
                     if (!tmp) {
                         mr_free(tmp);
+                        mr_free(fname);
                         fatal_error("ntfsresize not found");
                     }
@@ -799 +800 @@
                 break;
             }
-        }
+            mr_free(fname);
+        }
+        mr_free(fname);
     }
     log_it("Closing...");
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    paranoid_free(fname);
     return (scratchL);
 }
@@ -817 +819 @@
 {
     /*@ buffer ****************************************************** */
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *command = NULL;
     long long llres;
@@ -833 +835 @@
       llres = 0;
     } else {
-      (void) fgets(tmp, MAX_STR_LEN, fin);
+      mr_getline(tmp, fin);
       paranoid_pclose(fin);
       p = strchr(tmp, '\t');
@@ -843 +845 @@
         llres += (int) (*p - '0');
       }
+      mr_free(tmp);
     }
     mr_free(command);
@@ -1289 +1292 @@
     }
     /* BERLIOS: This is just plain WRONG !! */
-    mr_asprintf(do_not_compress_these, "%s", last_line_of_file(tmp));
+    do_not_compress_these = last_line_of_file(tmp);
     mr_free(tmp);
 

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -38 +38 @@
     /*@ buffers ***************************************************** */
     static char result[512];
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -44 +44 @@
 
     /*@ initialize data ********************************************* */
-    malloc_string(tmp);
     result[0] = '\0';
-    tmp[0] = '\0';
 
     /*@******************************************************************** */
@@ -52 +50 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-             fgets(tmp, MAX_STR_LEN, fin)) {
+        for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
             if (strlen(tmp) > 1) {
-                strcpy(result, tmp);
-            }
-        }
+                strncpy(result, 511, tmp);
+            }
+            mr_free(tmp);
+        }
+        mr_free(tmp);
         paranoid_pclose(fin);
     } else {
@@ -63 +62 @@
     }
     strip_spaces(result);
-    paranoid_free(tmp);
     return (result);
 }
@@ -163 +161 @@
         mr_free(command);
         command = tmp2;
-#ifndef _XWIN
         if (!g_text_mode) {
             newtSuspend();
         }
-#endif
         log_msg(1, "command = '%s'", command);
         retval += system(command);
@@ -294 +290 @@
     fin = fopen(tmp1, "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN, fin)) {
+        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin); fgets(incoming, MAX_STR_LEN, fin)) {
             p = incoming;
             while (p && *p) {
@@ -304 +299 @@
             }
             strip_spaces(incoming);
-            if ((res == 0 && log_if_success)
-                || (res != 0 && log_if_failure)) {
+            if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
                 log_msg(0, incoming);
             }
@@ -375 +369 @@
         }
     }
-#ifdef _XWIN
-    /* This only can update when newline goes into the file,
-       but it's *much* prettier/faster on Qt. */
-    while (does_file_exist(lockfile)) {
-        while (!feof(fin)) {
-            if (!fgets(tmp1, 512, fin))
-                break;
-            log_to_screen(tmp1);
-        }
-        usleep(500000);
-    }
-#else
-    /* This works on Newt, and it gives quicker updates. */
+
     for (; does_file_exist(lockfile); sleep(1)) {
         log_file_end_to_screen(MONDO_LOGFILE, "");
         update_evalcall_form(1);
     }
-#endif
+
     /* Evaluate the status returned by pclose to get the exit code of the called program. */
     errno = 0;

branches/2.2.10/mondo/src/common/libmondo-gui-EXT.h

@@ -1 +1 @@
 /* libmondo-gui-EXT.h */
 
-#ifdef _XWIN
-#include "X-specific-EXT.h"
-#else
 #include "newt-specific-EXT.h"
-#endif

branches/2.2.10/mondo/src/common/libmondo-gui.c

@@ -9 +9 @@
  */
 
-#ifdef _XWIN
-#include "X-specific.c"
-#else
 #include "newt-specific.c"
-#endif

branches/2.2.10/mondo/src/common/libmondo-gui.h

@@ -3 +3 @@
  */
 
-#ifdef _XWIN
-#include "X-specific.h"
-#else
 #include "newt-specific.h"
-#endif

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

@@ -821 +821 @@
         return (1);
     }
-    malloc_string(incoming);
     malloc_string(siz);
-    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
     log_it("Loading mountlist...");
+    mr_getline(incoming, fin);
     while (!feof(fin)) {
 #if linux
-        res = sscanf(incoming,
-               "%s %s %s %s %s",
-               mountlist->el[items].device,
-               mountlist->el[items].mountpoint,
-               mountlist->el[items].format,
-               siz, mountlist->el[items].label);
+        res = sscanf(incoming, "%s %s %s %s %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, siz, mountlist->el[items].label);
         if (res < 5) {
             /* no label found */
@@ -839 +833 @@
         }
 #elif __FreeBSD__
-        res = sscanf(incoming,
-               "%s %s %s %s",
-               mountlist->el[items].device,
-               mountlist->el[items].mountpoint,
-               mountlist->el[items].format, siz);
+        res = sscanf(incoming, "%s %s %s %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label,"");
 #endif
@@ -854 +844 @@
             !strcmp(mountlist->el[items].device, "devpts")
             ) {
-            log_msg(1,
-                    "Ignoring %s in mountlist - not loading that line :) ",
-                    mountlist->el[items].device);
-            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+            log_msg(1, "Ignoring %s in mountlist - not loading that line :) ", mountlist->el[items].device);
+            mr_free(incoming);
+            mr_getline(incoming, fin);
             continue;
         }
@@ -880 +869 @@
                     *(p + 2) = *(p + 3);
                 }
-                log_it("It was %s; it is now %s",
-                       mountlist->el[items].device, tmp);
+                log_it("It was %s; it is now %s", mountlist->el[items].device, tmp);
                 strcpy(mountlist->el[items].device, tmp);
             }
             paranoid_free(tmp);
 
-            log_it("%s %s %s %lld %s",
-                     mountlist->el[items].device,
-                     mountlist->el[items].mountpoint,
-                     mountlist->el[items].format,
-                     mountlist->el[items].size,
-                     mountlist->el[items].label);
+            log_it("%s %s %s %lld %s", mountlist->el[items].device, mountlist->el[items].mountpoint, mountlist->el[items].format, mountlist->el[items].size, mountlist->el[items].label);
             items++;
             if (items >= MAX_MOUNTLIST_ENTRIES) {
@@ -898 +881 @@
             }
         }
-        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
-    }
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
     paranoid_fclose(fin);
     mountlist->entries = items;
@@ -906 +891 @@
     log_it("%d entries in mountlist", items);
 
-    paranoid_free(incoming);
     paranoid_free(siz);
     return (0);

branches/2.2.10/mondo/src/common/libmondo-raid.c

@@ -427 +427 @@
 int get_next_raidtab_line(FILE * fin, char *label, char *value)
 {
-    char *incoming;
+    char *incoming = NULL;
     char *p;
 
-    malloc_string(incoming);
     assert(fin != NULL);
     assert(label != NULL);
@@ -437 +436 @@
     label[0] = value[0] = '\0';
     if (feof(fin)) {
-        paranoid_free(incoming);
         return (1);
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        strip_spaces(incoming);
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+        mr_strip_spaces(incoming);
         p = strchr(incoming, ' ');
         if (strlen(incoming) < 3 || incoming[0] == '#' || !p) {
+            mr_free(incoming);
             continue;
         }
@@ -453 +451 @@
         strcpy(label, incoming);
         strcpy(value, p);
-        paranoid_free(incoming);
+        mr_free(incoming);
         return (0);
     }
+    mr_free(incoming);
     return (1);
 }
@@ -805 +804 @@
     static char *argv[64];
     char **ap;
-    char *line = (char *) malloc(MAX_STR_LEN);
-    if (!line)
-        errx(1,
-             "unable to allocate %i bytes of memory for `char *line' at %s:%i",
-             MAX_STR_LEN, __FILE__, __LINE__);
-    (void) fgets(line, MAX_STR_LEN, f);
+    char *line = NULL;
+
+    mr_getline(line, f);
     if (feof(f)) {
         log_it("[GNVCL] Uh... I reached the EOF.");
@@ -822 +818 @@
             cnt++;
         }
+    mr_free(line);
 
     if (strchr(argv[cnt - 1], '\n')) {

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -108 +108 @@
         return;
     }
-#ifndef _XWIN
     if (!g_text_mode)
         newtSuspend();
-#endif
     printf("ASSERTION FAILED: `%s'\n", exp);
     printf("\tat %s:%d in %s\n\n", file, line, function);
@@ -158 +156 @@
     getchar();                  // skip \n
 
-#ifndef _XWIN
     if (!g_text_mode)
         newtResume();
-#endif
 }
 
@@ -344 +340 @@
         output[i - 1] = '\0';
     }
-    if (g_text_mode
-        /* && !strstr(last_line_of_file(MONDO_LOGFILE),output) */ ) {
+    if (g_text_mode) {
         printf("%s\n", output);
     }

branches/2.2.10/mondo/src/common/libmondo-verify.c

@@ -411 +411 @@
     char *command = NULL;
     char *outlog = NULL;
-    char *tmp;
-    //  char *p;
+    char *tmp = NULL;
 
     /*@ pointers ******************************************************* */
@@ -422 +421 @@
 
 
-    malloc_string(tmp);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
@@ -499 +497 @@
         pin = popen(command, "r");
         if (pin) {
-            for (fgets(tmp, MAX_STR_LEN, pin); !feof(pin);
-                 fgets(tmp, MAX_STR_LEN, pin)) {
+            for (mr_getline(tmp, pin); !feof(pin); mr_getline(tmp, pin)) {
                 if (bkpinfo->use_star) {
                     if (!strstr(tmp, "diffopts=")) {
-                        while (strlen(tmp) > 0
-                               && tmp[strlen(tmp) - 1] < 32) {
+                        while (strlen(tmp) > 0 && tmp[strlen(tmp) - 1] < 32) {
                             tmp[strlen(tmp) - 1] = '\0';
                         }
                         if (strchr(tmp, '/')) {
                             if (!diffs) {
-                                log_msg(0, "'%s' - differences found",
-                                        tarball_fname);
+                                log_msg(0, "'%s' - differences found", tarball_fname);
                             }
-                            log_msg(0, "star: /%s",
-                                    strip_afio_output_line(tmp));
+                            log_msg(0, "star: /%s", strip_afio_output_line(tmp));
                             diffs++;
                         }
@@ -519 +513 @@
                 } else {
                     if (!diffs) {
-                        log_msg(0, "'%s' - differences found",
-                                tarball_fname);
+                        log_msg(0, "'%s' - differences found", tarball_fname);
                     }
                     log_msg(0, "afio: /%s", strip_afio_output_line(tmp));
                     diffs++;
                 }
+                mr_free(tmp);
             }
+            mr_free(tmp);
             paranoid_pclose(pin);
         } else {
@@ -533 +528 @@
     mr_free(command);
     mr_free(outlog);
-    paranoid_free(tmp);
     return (0);
 }
@@ -681 +675 @@
     mr_asprintf(biggie_cksum, "%s", slice_fnam);
     if (biggie_cksum[0] != '\0') {
-        mr_asprintf(orig_cksum, "%s", calc_checksum_of_file(biggie_fname));
+        orig_cksum = calc_checksum_of_file(biggie_fname);
         if (strcmp(biggie_cksum, orig_cksum)) {
             log_msg(2, "orig cksum=%s; curr cksum=%s", biggie_cksum, orig_cksum);
@@ -690 +684 @@
             mr_free(tmp);
         }
+        mr_free(orig_cksum);
     }
     mr_free(biggie_cksum);
     mr_free(test_file);
-    mr_free(orig_cksum);
     paranoid_free(slice_fnam);
     return (retval);

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -124 +124 @@
         /*@ buffers ********************************************************** */
         int i;
+        char *tmp;
 
          assert_string_is_neither_NULL_nor_zerolength(prompt);
 
         if (g_text_mode) {
-
-            char *tmp;
-            tmp = malloc(MAX_NEWT_COMMENT_LEN);
-
             while (1) {
                 system("sync");
-                printf
-                    ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
-                     prompt);
-                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                printf("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ", prompt);
+                mr_getline(tmp, stdin);
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -146 +141 @@
                 }
                 if (strstr("yesYES", tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (TRUE);
                 } else if (strstr("NOno", tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (FALSE);
                 } else {
                     system("sync");
-                    printf
-                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
+                    printf("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
                 }
             }
@@ -172 +166 @@
 
         /*@ buffer *********************************************************** */
-        char *tmp;
+        char *tmp = NULL;
         int i;
 
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(prompt);
+
         if (g_text_mode) {
             system("sync");
-            printf
-                ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
-                 prompt);
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            printf("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ", prompt);
+            mr_getline(tmp, stdin);
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -191 +183 @@
             }
             if (strstr("okOKOkYESyes", tmp)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
         } else {
-            paranoid_free(tmp);
             return (popup_with_buttons(prompt, " Okay ", "Cancel"));
         }
@@ -431 +422 @@
  * @param grep_for_me If not "", then only give lines in @p filename that match this regular expression.
  */
-    void
-     log_file_end_to_screen(char *filename, char *grep_for_me) {
+void log_file_end_to_screen(char *filename, char *grep_for_me) {
 
         /*@ buffers ********************************************************** */
@@ -462 +452 @@
                 for (err_log_lines[i][0] = '\0';
                      strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN,
-                                 fin);
+                    (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin);
                     /* Commented to make valgrind happy and avoid crash
                     strip_spaces(err_log_lines[i]);
@@ -787 +776 @@
 
         /*@ buffers *********************************************************** */
-        char *prompt;
+        char *prompt = NULL;
 
         /*@ newt ************************************************************** */
@@ -799 +788 @@
         assert(button1 != NULL);
         assert(button2 != NULL);
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             if (strlen(button2) == 0) {
@@ -806 +794 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (prompt[0] = '\0';
-                 strcmp(prompt, button1) && (strlen(button2) == 0
-                                          || strcmp(prompt, button2));) {
+            mr_getline(prompt, stdin);
+            while (strcmp(prompt, button1) && (strlen(button2) == 0 || strcmp(prompt, button2))) {
                 printf("--> ");
-                (void) fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+                mr_free(prompt);
+                mr_getline(prompt, stdin);
             }
             if (!strcmp(prompt, button1)) {
-                paranoid_free(prompt);
+                mr_free(prompt);
                 return (TRUE);
             } else {
-                paranoid_free(prompt);
+                mr_free(prompt);
                 return (FALSE);
             }
         }
 
+        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         strncpy(prompt, p, MAX_NEWT_COMMENT_LEN - 1);
         prompt[MAX_NEWT_COMMENT_LEN - 1] = '\0';
@@ -1166 +1155 @@
             { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
 "nfs", "iso", NULL };
-        char *outstr;
+        char *outstr = NULL;
         t_bkptype backup_type;
         int i;
@@ -1181 +1170 @@
         newtComponent myForm;
 
-        outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
@@ -1190 +1178 @@
                 }
                 printf(")\n--> ");
-                (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
-                strip_spaces(outstr);
+                mr_getline(outstr, stdin);
+                mr_strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
                     if (!strcmp(possible_responses[i], outstr)) {
@@ -1197 +1185 @@
                     }
                 }
-            }
-            paranoid_free(outstr);
+                mr_free(outstr);
+            }
             return (backup_type);
         }
@@ -1319 +1307 @@
         int j = 0;
         bool done;
-        char *tmp;
+        char *tmp = NULL;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1338 +1326 @@
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
+            mr_free(tmp1);
             return(1);
             }
 
-        malloc_string(tmp);
         log_msg(2, "Loading %s", source_file);
-        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
-             filelist->entries++) {
+        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; filelist->entries++) {
           god_i_hate_gotos:
+            if (tmp != NULL) {
+                mr_free(tmp);
+            }
             if (feof(fin)) {
                 break;
             }
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            mr_getline(tmp, fin);
             i = (int) strlen(tmp);
             if (i < 2) {
@@ -1366 +1356 @@
                 goto god_i_hate_gotos;
             }
-            filelist->el[filelist->entries].severity =
-                severity_of_difference(tmp, NULL);
+            filelist->el[filelist->entries].severity = severity_of_difference(tmp, NULL);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
@@ -1373 +1362 @@
             }
         }
+        mr_free(tmp);
         paranoid_fclose(fin);
         paranoid_fclose(fout);
@@ -1378 +1368 @@
             log_to_screen("%d files listed in %s/changed.files have been deleted since backup was made\nand are referenced in %s", j, bkpinfo->tmpdir,tmp1);
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen("Arbitrary limits suck, man!");
-            paranoid_free(tmp);
             return (1);
         }
@@ -1409 +1398 @@
             }
         }
-        paranoid_free(tmp);
         log_it("leaving");
         return (0);

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -188 +188 @@
 {
     /**  buffers **********************************************/
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
-    char *incoming;
+    char *incoming = NULL;
     char *command;
     char *lvscan_sz = NULL;
@@ -225 +225 @@
     }
 
-    malloc_string(tmp);
-    malloc_string(incoming);
     command = malloc(1024);
 
@@ -271 +269 @@
     log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
     rewind(fin);
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         fgetpos(fin, &orig_pos);
         if (incoming[0] != '#') {
+            mr_free(incoming);
             continue;
         }
@@ -284 +283 @@
         if ((p = strstr(incoming, "vgcreate"))) {
             // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
-            for (fgets(tmp, MAX_STR_LEN - 1, fin); !feof(fin); fgets(tmp, MAX_STR_LEN - 1, fin)) {
+            for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
                 if (tmp[0] == '#') {
                     fsetpos(fin, &orig_pos);
@@ -290 +289 @@
                 } else {
                     fgetpos(fin, &orig_pos);
-                    strcat(incoming, tmp);
+                    mr_strcat(incoming, tmp);
                 }
-            }
+                mr_free(tmp);
+            }
+            mr_free(tmp);
+
             for (q = incoming; *q != '\0'; q++) {
                 if (*q < 32) {
@@ -298 +300 @@
                 }
             }
-            strcpy(tmp, p + strlen("vgcreate") + 1);
+            mr_asprintf(tmp, "%s", p + strlen("vgcreate") + 1);
             for (q = tmp; *q > 32; q++);
             *q = '\0';
             log_msg(1, "Deleting old entries at /dev/%s", tmp);
             mr_asprintf(tmp1, "rm -Rf /dev/%s", tmp);
+            mr_free(tmp);
+
             run_program_and_log_output(tmp1, 1);
             mr_free(tmp1);
@@ -308 +312 @@
             run_program_and_log_output(vgscan_sz, 1);
             run_program_and_log_output(pvscan_sz, 1);
-            log_msg(3,
-                    "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'",
-                    incoming);
+            log_msg(3, "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'", incoming);
         }
         for (p = incoming + 1; *p == ' '; p++);
+        mr_free(incoming);
+
         strcpy(command, p);
         for (p = command; *p != '\0'; p++);
@@ -330 +334 @@
             if (strstr(command, "lvm lvcreate"))
                 lvmversion = 2;
-            log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
+                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
+                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
             }
@@ -343 +346 @@
             extents = atol(p);
             log_msg(5, "p='%s' --> extents=%ld", p, extents);
+            mr_free(tmp);
+
             p = strstr(command, "-L");
             if (!p) {
@@ -395 +400 @@
         sleep(1);
     }
+    mr_free(incoming);
     mr_free(vgscan_sz);
     mr_free(pvscan_sz);
@@ -401 +407 @@
     log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
     }
-    paranoid_free(tmp);
-    paranoid_free(incoming);
     paranoid_free(command);
     system("sync");
@@ -440 +444 @@
 
     /** buffers **********************************************************/
-    char *incoming;
+    char *incoming = NULL;
 
     /** pointers *********************************************************/
@@ -450 +454 @@
     /** end **************************************************************/
 
-    malloc_string(incoming);
     assert(new_mountlist != NULL);
     assert(old_mountlist != NULL);
 
 #ifdef __FreeBSD__
-    log_to_screen
-        ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
+    log_to_screen("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
     return (1);
 #endif
@@ -472 +474 @@
                 finish(1);
             }
-            for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
-                 && !strstr(incoming, old_mountlist->el[lino].device);
-                 fgets(incoming, MAX_STR_LEN - 1, fin));
+            mr_getline(incoming, fin);
+            while (feof(fin) && !strstr(incoming, old_mountlist->el[lino].device)) {
+                mr_free(incoming);
+                mr_getline(incoming, fin);
+            }
+            mr_free(incoming);
+            
             if (!feof(fin)) {
                 log_it("Investigating %s", old_mountlist->el[lino].device);
 
-                for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
-                     && !strstr(incoming, "raiddev");
-                     fgets(incoming, MAX_STR_LEN - 1, fin)) {
-                    if (strstr(incoming, OSSWAP("device", "drive"))
-                        && !strchr(incoming, '#')) {
-                        for (p = incoming + strlen(incoming);
-                             *(p - 1) <= 32; p--);
+                for (mr_getline(incoming, fin); !feof(fin) && !strstr(incoming, "raiddev"); mr_getline(incoming, fin)) {
+                    if (strstr(incoming, OSSWAP("device", "drive")) && !strchr(incoming, '#')) {
+                        for (p = incoming + strlen(incoming); *(p - 1) <= 32; p--);
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
+
                         log_it("Extrapolating %s", p);
 
-                        for (j = 0;
-                             j < new_mountlist->entries
-                             && strcmp(new_mountlist->el[j].device, p);
-                             j++);
+                        for (j = 0; j < new_mountlist->entries && strcmp(new_mountlist->el[j].device, p); j++);
                         if (j >= new_mountlist->entries) {
-                            strcpy(new_mountlist->
-                                   el[new_mountlist->entries].device, p);
-                            strcpy(new_mountlist->
-                                   el[new_mountlist->entries].mountpoint,
-                                   "raid");
-                            strcpy(new_mountlist->
-                                   el[new_mountlist->entries].format,
-                                   "raid");
-                            new_mountlist->el[new_mountlist->entries].
-                                size = old_mountlist->el[lino].size;
+                            strcpy(new_mountlist->el[new_mountlist->entries].device, p);
+                            strcpy(new_mountlist->el[new_mountlist->entries].mountpoint, "raid");
+                            strcpy(new_mountlist->el[new_mountlist->entries].format, "raid");
+                            new_mountlist->el[new_mountlist->entries].size = old_mountlist->el[lino].size;
                             new_mountlist->entries++;
                         } else {
                             log_it("Not adding %s to mountlist: it's already there", p);
                         }
+                        mr_free(incoming);
                     }
                 }
+                mr_free(incoming);
             }
             paranoid_fclose(fin);
@@ -656 +652 @@
 #ifdef __FreeBSD__
     static bool vinum_started_yet = FALSE;
+    char *line = NULL;
+    char *status;
 #endif
 
@@ -710 +708 @@
         if (vinum_started_yet) {
             FILE *fin;
-            char line[MAX_STR_LEN];
 
             log_to_screen("Initializing Vinum device %s (this may take a *long* time)", device);
@@ -723 +720 @@
 
             fin = fopen("/tmp/plexes", "r");
-            while (fgets(line, MAX_STR_LEN - 1, fin)) {
+            /* BERLIOS: doesn't work */
+            while (mr_getline(line, fin)) {
                 if (strchr(line, '\n'))
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
@@ -740 +738 @@
                     mr_free(tmp);
 
-                    char status[MAX_STR_LEN / 4];
-                    fgets(status, MAX_STR_LEN / 4 - 1, pin);
+                    mr_getline(status, pin);
                     pclose(pin);
 
                     if (!strcmp(status, "up")) {
+                        mr_free(status);
                         break;  /* it's done */
                     }
                     update_evalcall_form(atoi(status));
                     usleep(250000);
+                    mr_free(status);
                 }
                 close_evalcall_form();
-            }
+                mr_free(line);
+            }
+            mr_free(line);
             fclose(fin);
             unlink("/tmp/plexes");
@@ -1721 +1722 @@
         fput_string_one_char_at_a_time(pout_to_fdisk, output);
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
-        mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
+        tmp = last_line_of_file(FDISK_LOG);
         if (strstr(tmp, " (m ")) {
             log_msg(1, "Successfully created partition %d on %s", partno, drive);
@@ -1912 +1913 @@
     char *output = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *partcode = NULL;
 
@@ -1981 +1983 @@
             res = 0;
             fput_string_one_char_at_a_time(pout_to_fdisk, "t\n");
-            if (partno > 1
-                || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {
+            tmp1 = last_line_of_file(FDISK_LOG);
+            if (partno > 1 || strstr(tmp1, " (1-4)")) {
                 log_msg(5, "Specifying partno (%d) - yay", partno);
                 mr_asprintf(tmp, "%d\n", partno);
@@ -1988 +1990 @@
                 mr_free(tmp);
 
-                log_msg(5, "A - last line = '%s'",
-                        last_line_of_file(FDISK_LOG));
-            }
+                mr_free(tmp1);
+                tmp1 = last_line_of_file(FDISK_LOG);
+                log_msg(5, "A - last line = '%s'", tmp1);
+            }
+            mr_free(tmp1);
 
             mr_asprintf(tmp, "%s\n", partcode);
@@ -1996 +2000 @@
             mr_free(tmp);
 
-            log_msg(5, "B - last line = '%s'",
-                    last_line_of_file(FDISK_LOG));
+            tmp1 = last_line_of_file(FDISK_LOG);
+            log_msg(5, "B - last line = '%s'", tmp1);
+            mr_free(tmp1);
+
             fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
-            log_msg(5, "C - last line = '%s'",
-                    last_line_of_file(FDISK_LOG));
-
-            mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
-            if (!strstr(tmp, " (m ")) {
-                log_msg(1, "last line = '%s'; part type set failed", tmp);
+            tmp1 = last_line_of_file(FDISK_LOG);
+            log_msg(5, "C - last line = '%s'", tmp1);
+            mr_free(tmp1);
+
+            tmp1 = last_line_of_file(FDISK_LOG);
+            if (!strstr(tmp1, " (m ")) {
+                log_msg(1, "last line = '%s'; part type set failed", tmp1);
                 res++;
                 fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
             }
-            mr_free(tmp);
+            mr_free(tmp1);
 
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
             mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
-            mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
-                    MONDO_LOGFILE, MONDO_LOGFILE);
+            mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
             log_msg(5, "output = '%s'", output);
             log_msg(5, "partno=%d; partcode=%s", partno, partcode);
@@ -2157 +2163 @@
     /** int *************************************************************/
     int retval = 0;
+
+    /** char ************************************************************/
+    char *incoming = NULL;
 #ifndef __FreeBSD__
+    char *dev;
+    char *p;
     int res;
 #endif
 
-    /** char ************************************************************/
-    char *incoming;
-#ifndef __FreeBSD__
-    char *dev;
-#endif
     /** pointers ********************************************************/
-#ifndef __FreeBSD__
-    char *p;
-#endif
     FILE *fin;
     int i;
@@ -2175 +2178 @@
     /** end ****************************************************************/
 
-    malloc_string(dev);
-    malloc_string(incoming);
     assert(mountlist != NULL);
 
     for (i = 0; i < 3; i++) {
 #ifdef __FreeBSD__
-        fin =
-            popen
-            ("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2",
-             "r");
+        fin = popen("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2", "r");
         if (!fin) {
-            paranoid_free(dev);
-            paranoid_free(incoming);
             return (1);
         }
-        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN - 1, fin)) {
+        for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
             retval += stop_raid_device(incoming);
-        }
+            mr_free(incoming);
+        }
+        mr_free(incoming);
 #else
         fin = fopen("/proc/mdstat", "r");
         if (!fin) {
             log_OS_error("/proc/mdstat");
-            paranoid_free(dev);
-            paranoid_free(incoming);
             return (1);
         }
-        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN - 1, fin)) {
-            for (p = incoming;
-                 *p != '\0' && (*p != 'm' || *(p + 1) != 'd'
-                                || !isdigit(*(p + 2))); p++);
+        for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+            for (p = incoming; *p != '\0' && (*p != 'm' || *(p + 1) != 'd' || !isdigit(*(p + 2))); p++);
             if (*p != '\0') {
-                sprintf(dev, "/dev/%s", p);
+                mr_asprintf(dev, "/dev/%s", p);
                 for (p = dev; *p > 32; p++);
                 *p = '\0';
                 res = stop_raid_device(dev);
-            }
-        }
+                mr_free(dev);
+            }
+            mr_free(incoming);
+        }
+        mr_free(incoming);
 #endif
     }
@@ -2220 +2215 @@
         log_msg(1, "Warning - unable to stop some RAID devices");
     }
-    paranoid_free(dev);
-    paranoid_free(incoming);
     system("sync");
     system("sync");

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -670 +670 @@
     mr_free(bkpinfo->media_device);
     if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
     } else {
         bkpinfo->media_device = find_cdrom_device(FALSE);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -533 +533 @@
 
     system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    personalities = last_line_of_file("/tmp/raid-personalities.txt");
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
     mr_free(personalities);
@@ -2291 +2291 @@
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
         mr_free(idev);
-        mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        idev = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
         mr_asprintf(isodir_format, "nfs");
         mr_free(isodir_path);
-        mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH"));
+        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
     }
 
@@ -2861 +2861 @@
   /** char *************************************************************/
     char output = '\0';
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
   /** newt *************************************************************/
@@ -2873 +2873 @@
 
     if (g_text_mode) {
-        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
-            printf
-                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
-            fgets(tmp, MAX_STR_LEN - 1, stdin);
+        while (!strchr("AICE", output)) {
+            printf("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
+            mr_getline(tmp, stdin);
+            output = tmp[0];
+            free(tmp);
         }
         return (output);
     }
 
-    newtPushHelpLine
-        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
+    newtPushHelpLine("   Do you want to 'nuke' your system, restore interactively, or just compare?");
     newtOpenWindow(24, 3, 32, 17, "How should I restore?");
     b1 = newtButton(7, 1, "Automatically");

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -107 +107 @@
 * @ingroup restoreUtilityGroup
 */
-void ask_about_these_imagedevs(char *infname, char *outfname)
-{
+void ask_about_these_imagedevs(char *infname, char *outfname) {
+
 FILE *fin;
 FILE *fout;
-/************************************************************************
-* allocate memory regions. test and set  -sab 16 feb 2003              *
-************************************************************************/
-char *incoming_ptr;
-char *question_ptr = NULL;
-
-char incoming[MAX_STR_LEN] = "\0";
+char *incoming = NULL;
+char *question = NULL;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
 assert_string_is_neither_NULL_nor_zerolength(outfname);
 
-incoming_ptr = malloc(sizeof(incoming));
-if (incoming_ptr == NULL) {
-fprintf(stderr, "Out of Memory\n");
-exit(EXIT_FAILURE);
-}
-
-memset(incoming_ptr, '\0', sizeof(incoming));
-
 if (!(fin = fopen(infname, "r"))) {
-fatal_error("Cannot openin infname");
+    fatal_error("Cannot openin infname");
 }
 if (!(fout = fopen(outfname, "w"))) {
-fatal_error("Cannot openin outfname");
-}
-for (fgets(incoming_ptr, MAX_STR_LEN, fin);
- !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-strip_spaces(incoming_ptr);
-
-if (incoming[0] == '\0') {
-    continue;
-}
-
-mr_asprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
-
-if (ask_me_yes_or_no(question_ptr)) {
-    fprintf(fout, "%s\n", incoming_ptr);
-}
-}
-
-/*** free memory ***********/
-paranoid_free(incoming_ptr);
-incoming_ptr = NULL;
-mr_free(question_ptr);
+    fatal_error("Cannot openin outfname");
+}
+for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+    mr_strip_spaces(incoming);
+
+    if (incoming[0] == '\0') {
+        mr_free(incoming);
+        continue;
+    }
+
+    mr_asprintf(question, "Should I restore the image of %s ?", incoming);
+    
+    if (ask_me_yes_or_no(question)) {
+        fprintf(fout, "%s\n", incoming);
+    }
+    mr_free(incoming);
+}
+mr_free(incoming);
+mr_free(question);
 paranoid_fclose(fout);
 paranoid_fclose(fin);
@@ -619 +604 @@
         mr_free(bkpinfo->media_device);
         if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+            bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
         } else {
             bkpinfo->media_device = find_cdrom_device(TRUE);
@@ -1119 +1104 @@
 char *command = NULL;
 char *tmp;
+char *tmp1 = NULL;
 int res = 0;
 pid_t pid;
@@ -1260 +1246 @@
     if (g_text_mode) {
         printf("Restore which directory? --> ");
-        fgets(tmp, sizeof(tmp), stdin);
-        toggle_path_selection(filelist, tmp, TRUE);
-        if (strlen(tmp) == 0) {
+        mr_getline(tmp1, stdin);
+        toggle_path_selection(filelist, tmp1, TRUE);
+        if (strlen(tmp1) == 0) {
             res = 1;
         } else {
             res = 0;
         }
+        mr_free(tmp1);
     } else {
         res = edit_filelist(filelist);
@@ -1938 +1925 @@
     FILE *fin;
     FILE *fout;
-  /** malloc **/
-    char *incoming;
+    char *incoming = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
     assert_string_is_neither_NULL_nor_zerolength(input_file);
-    malloc_string(incoming);
 
     if (!(fin = fopen(input_file, "r"))) {
@@ -1952 +1937 @@
         fatal_error("cannot open output_file");
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1962 +1946 @@
             && strncmp(incoming, "var/", 4))
             fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(incoming);
 }
 

branches/2.2.10/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf snprintf strcat strncat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
+for s in asprintf mr_asprintf sprintf snprintf strcat strncat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline ARBITRARY_MAXIMUM MAX_TAPECATALOG_ENTRIES MAX_MOUNTLIST_ENTRIES MAXIMUM_RAID_DEVS MAXIMUM_ADDITIONAL_RAID_VARS MAXIMUM_DISKS_PER_RAID_DEV MAX_TAPECAT_FNAME_LEN MAX_NOOF_MEDIA MAX_NEWT_COMMENT_LEN MAX_NOOF_SETS_HERE MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
     echo "mondorescue $s usage : "
     tot=0