Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/libmondo-filelist.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

• branches/3.0/mondo/src/common/libmondo-filelist.c (modified) (55 diffs)

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

@@ -86 +86 @@
 
     /*@ pointers ********************** */
-    char *ptr = NULL;
+    char *ptr;
     FILE *fout;
 
@@ -116 +116 @@
     mr_free(tempfile);
 
-    if (bkpinfo->image_devs) {
-        log_it("image_devs : %s", bkpinfo->image_devs);
-
-        ptr = bkpinfo->image_devs;
-
-        while (ptr && *ptr) {
-            mr_asprintf(dev, "%s", ptr);
-            log_it("Examining imagedev %s", dev);
-            for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
-            dev[i] = '\0';
-            if (!strlen(dev)) {
-                mr_free(dev);
-                continue;
-            }
-            fprintf(fout, "%s\n", dev);
-            log_it("Adding '%s' to biggielist", dev);
-            if ((ptr = strchr(ptr, ' '))) {
-                ptr++;
-            }
-            mr_free(dev);
+    log_it(bkpinfo->image_devs);
+
+    ptr = bkpinfo->image_devs;
+
+    malloc_string(dev);
+    while (ptr && *ptr) {
+        strcpy(dev, ptr);
+        log_it("Examining imagedev %s", dev);
+        for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
+        dev[i] = '\0';
+        if (!strlen(dev)) {
+            continue;
+        }
+        fprintf(fout, "%s\n", dev);
+        log_it("Adding '%s' to biggielist", dev);
+        if ((ptr = strchr(ptr, ' '))) {
+            ptr++;
         }
     }
@@ -141 +138 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
+    paranoid_free(dev);
     return (retval);
 }
@@ -160 +158 @@
 
     mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
+
     mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
@@ -332 +331 @@
 
     if (curr_set_no == 0) {
-        log_msg(1, "Only one fileset. Fine.");
+        mr_asprintf(tmp, "Only one fileset. Fine.");
     } else {
-        log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1);
-    }
+        mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+    }
+    log_msg(1, tmp);
+    mr_free(tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -341 +342 @@
        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);
@@ -347 +349 @@
         newtPopWindow();
     }
+#endif
     return (err ? 0 : curr_set_no + 1);
 }
@@ -407 +410 @@
 int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
 {
-    FILE *pattr = NULL;
-    char *tmp = NULL;
+    FILE *pattr;
+    char *tmp;
+    char *p;
 
     pattr = popen(syscall, "r");
@@ -420 +424 @@
         return (2);
     }
-    for (mr_getline(tmp, pattr); !feof(pattr); mr_getline(tmp, pattr)) {
+    malloc_string(tmp);
+    for (p = fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr) && (p != NULL);
+         p = fgets(tmp, MAX_STR_LEN, pattr)) {
         fputs(tmp, pout);
-        mr_free(tmp);
-    }
-    mr_free(tmp);
+    }
     paranoid_pclose(pattr);
+    paranoid_free(tmp);
     return (0);
 }
@@ -434 +439 @@
                  char *auxlist_fname)
 {
-    FILE *fin = NULL;
-    FILE *pout = NULL;
+    FILE *fin;
+    FILE *pout;
     char *pout_command = NULL;
-    char *syscall = NULL;
-    char *file_to_analyze = NULL;
+    char *syscall;
+    char *file_to_analyze;
     char *strtmp = NULL;
     char *tmp = NULL;
+    char *p = NULL;
     int i;
 
@@ -456 +462 @@
     mr_free(pout_command);
 
-    for (mr_getline(file_to_analyze, fin); !feof(fin); mr_getline(file_to_analyze, fin)) {
+    malloc_string(file_to_analyze);
+    for (p = fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+         p = fgets(file_to_analyze, MAX_STR_LEN, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -464 +472 @@
         tmp = mr_stresc(file_to_analyze, "'", '\\', '\'');
         mr_asprintf(syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);    // " MONDO_LOGFILE);
-        mr_free(tmp);
+        paranoid_free(tmp);
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        mr_free(syscall);
-        mr_free(file_to_analyze);
-    }
-    mr_free(file_to_analyze);
+        paranoid_free(syscall);
+    }
     paranoid_fclose(fin);
     paranoid_pclose(pout);
+    paranoid_free(file_to_analyze);
     return (0);
 }
@@ -515 +522 @@
     char *syscall_pin = NULL;
     char *syscall_pout = NULL;
-    char *incoming = NULL;
-    char *current_subset_file = NULL;
-    char *current_master_file = NULL;
+    char *incoming;
+    char *current_subset_file, *current_master_file;
     char *masklist = NULL;
     int retval = 0;
     int i;
-    char *p, *q;
+    char *p, *q, *r;
     char *tmp = NULL;
     FILE *pin, *pout, *faclin;
 
-    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist, original_exat_fname, executable);
+    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
+            original_exat_fname, executable);
     if (!orig_msklist || !orig_msklist[0]
         || !does_file_exist(orig_msklist)) {
@@ -545 +552 @@
     }
     if (length_of_file(original_exat_fname) <= 0) {
-        log_msg(1, "original_exat_fname %s is empty or missing, so no need to set EXAT list", original_exat_fname);
+        log_msg(1,
+                "original_exat_fname %s is empty or missing, so no need to set EXAT list",
+                original_exat_fname);
         return (0);
     }
+    malloc_string(incoming);
+    malloc_string(current_subset_file);
+    malloc_string(current_master_file);
     mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
@@ -554 +566 @@
 
     sort_file(masklist);
+    current_subset_file[0] = current_master_file[0] = '\0';
 
     mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
@@ -586 +599 @@
 //  printf("Hi there. Starting the loop\n");
 
-    mr_getline(current_subset_file, faclin);
-    mr_getline(incoming, pin);
-    while (!feof(pin) && !feof(faclin)) {
-        mr_asprintf(current_master_file, "%s", incoming + 8);
+    r = fgets(current_subset_file, MAX_STR_LEN, faclin);
+    r = fgets(incoming, MAX_STR_LEN, pin);
+    while (!feof(pin) && !feof(faclin) && (r != NULL)) {
+//      printf("incoming = %s", incoming);
+
+        strcpy(current_master_file, incoming + 8);
 
         p = current_subset_file;
@@ -617 +632 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            mr_free(current_subset_file);
-            mr_getline(current_subset_file, faclin);
+            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
             continue;
         }
@@ -625 +639 @@
             fputs(incoming, pout);
         }
-        mr_free(incoming);
-        mr_getline(incoming, pin);
+        r = fgets(incoming, MAX_STR_LEN, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
         }
+//      if (!i) { printf("Match --- %s\n", q); }
 
         while (!feof(pin) && strncmp(incoming, "# file: ", 8)) {
             if (!i) {
+
+//    printf("%s", incoming);
+
                 fputs(incoming, pout);
             }
-            mr_free(incoming);
-            mr_getline(incoming, pin);
+            r = fgets(incoming, MAX_STR_LEN, pin);
         }
         if (!i) {
-            mr_free(current_subset_file);
-            mr_getline(current_subset_file, faclin);
-        }
-        mr_free(current_master_file);
-    }
-    mr_free(current_subset_file);
-    mr_free(incoming);
+            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
+        }
+    }
+    while (!feof(pin)) {
+        r = fgets(incoming, MAX_STR_LEN, pin);
+    }
     fclose(faclin);
     pclose(pin);
     pclose(pout);
 
+//  printf("OK, loop is done\n");
+
     unlink(masklist);
     mr_free(masklist);
 
+    paranoid_free(current_subset_file);
+    paranoid_free(current_master_file);
+    paranoid_free(incoming);
     return (retval);
 }
@@ -750 +770 @@
     noof_chars = strlen(string_to_add) + 1; /* we include the '\0' */
 
-    /* walk across tree if necessary */
+/* walk across tree if necessary */
     node = startnode;
     char_to_add = string_to_add[0];
@@ -759 +779 @@
     }
 
-    /* walk down tree if appropriate */
+/* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_add) {
         log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
@@ -773 +793 @@
     }
 
-    /* add here */
+/* add here */
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
         log_to_screen("failed to malloc");
@@ -844 +864 @@
     /*@ buffers **************************************************** */
     char *command_to_open_fname = NULL;
-    char *fname = NULL;
-    char *tmp = NULL;
+    char fname[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
     char *tmp1 = NULL;
     int pos_in_fname;
@@ -891 +911 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for (mr_getline(fname, pin); !feof(pin); mr_getline(fname, pin)) {
-        if ((strlen(fname) > 0) && (fname[strlen(fname) - 1] == 13 || fname[strlen(fname) - 1] == 10)) {
+    for (tmp1 = fgets(fname, MAX_STR_LEN, pin); !feof(pin);
+         tmp1 = fgets(fname, MAX_STR_LEN, pin)) {
+        if (((fname[strlen(fname) - 1] == 13) || (fname[strlen(fname) - 1] == 10)) && (strlen(fname) > 0)) {
             fname[strlen(fname) - 1] = '\0';
         }
+//      strip_spaces (fname);
         if (!strlen(fname)) {
-            mr_free(fname);
             continue;
         }
@@ -903 +924 @@
                 continue;
             }
-            mr_asprintf(tmp, "%s", fname);
+            strcpy(tmp, fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
-            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
-
         if (!(++lino % 1111)) {
             percentage = (int) (lino * 100 / lines_in_filelist);
             update_evalcall_form(percentage);
         }
-        mr_free(fname);
-    }
-    mr_free(fname);
-
+    }
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1281 +1297 @@
 
 
+
+
 /**
  * Number of entries in the skeleton filelist.
@@ -1296 +1314 @@
  * @bug Return value should be @c void.
  */
-int open_and_list_dir(char *dir1, char *sth, FILE * fout, time_t time_of_last_full_backup) {
-
+int open_and_list_dir(char *dir1, char *sth, FILE * fout,
+                      time_t time_of_last_full_backup)
+{
     const char delims[] = "|";
 
@@ -1304 +1323 @@
     struct stat statbuf;
     char *new;
-    char *tmp = NULL;
+    char *tmp;
     char *dir = NULL;
     static int percentage = 0;
-    char *skip_these = NULL;
+    char *skip_these;
     char *new_with_pipe;
     char *strtmp = NULL;
     char *token = NULL;
     char *find_excludes = NULL;
-    char *name_of_evalcall_form = NULL;
-    char *find_skeleton_marker = NULL;
+    static char *name_of_evalcall_form;
     int i;
     int lastpos = 0;
@@ -1320 +1338 @@
     static int counter = 0;
     static int uberctr = 0;
-    static long skeleton_lino = 0L;
-    static time_t last_time = (time_t)0;
+    static char *find_skeleton_marker;
+    static long skeleton_lino = 0;
+    static time_t last_time = 0;
     time_t this_time;
 
@@ -1336 +1355 @@
 
     if (!depth) {
+        malloc_string(name_of_evalcall_form);
+        malloc_string(find_skeleton_marker);
         while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
           mr_strcat(find_excludes," -path %s -prune -o", token);
@@ -1354 +1375 @@
         mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
-        mr_free(find_excludes);
-
+        paranoid_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
         paranoid_system(strtmp);
-        mr_free(strtmp);
-
+        paranoid_free(strtmp);
         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));
-        mr_free(tmp);
-
-        mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
+        g_skeleton_entries =
+            1 + atol(call_program_and_get_last_line_of_output(tmp));
+        paranoid_free(tmp);
+        sprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
         open_evalcall_form(name_of_evalcall_form);
-        mr_free(name_of_evalcall_form);
-
+        find_skeleton_marker[0] = '\0';
         skeleton_lino = 1;
         log_msg(5, "entries = %ld", g_skeleton_entries);
@@ -1373 +1391 @@
     } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
     {
-        mr_asprintf(find_skeleton_marker, "grep -Fv '%s' %s > %s.new 2> /dev/null", dir, g_skeleton_filelist, g_skeleton_filelist);
+        sprintf(find_skeleton_marker,
+                "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
+                g_skeleton_filelist, g_skeleton_filelist);
+//    log_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-            mr_free(find_skeleton_marker);
-
-            mr_asprintf(find_skeleton_marker, "mv -f %s.new %s", g_skeleton_filelist, g_skeleton_filelist);
+//        log_msg(5, "Found %s", dir);
+//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
+            sprintf(find_skeleton_marker, "mv -f %s.new %s",
+                    g_skeleton_filelist, g_skeleton_filelist);
+//        log_msg(6, "fsm = %s", find_skeleton_marker);
             paranoid_system(find_skeleton_marker);
             time(&this_time);
             if (this_time != last_time) {
                 last_time = this_time;
+#ifndef _XWIN
                 if (!g_text_mode) {
                     int cols, rows;
@@ -1391 +1415 @@
                     mr_free(tmp);
                 }
+#endif
                 update_evalcall_form(percentage);
             }
         }
-        mr_free(find_skeleton_marker);
     }
 
@@ -1406 +1430 @@
         mr_asprintf(tmp,"opendir %s", dir1);
         log_OS_error(tmp);
-        mr_free(tmp);
+        paranoid_free(tmp);
     } else if (strstr(skip_these, new_with_pipe)) {
         log_msg(10, "Found dir ***%s**** excluded", dir1);
@@ -1420 +1444 @@
                 mr_asprintf(new,"%s%s",dir1,dit->d_name);
             }
-            mr_free(new_with_pipe);
+            paranoid_free(new_with_pipe);
             mr_asprintf(new_with_pipe, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                mr_free(new_with_pipe);
+                paranoid_free(new_with_pipe);
             } else {
-                mr_free(new_with_pipe);
+                paranoid_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
                         log_msg(10, "Found child dir ***%s**** parsed", new);
-                        open_and_list_dir(new, skip_these, fout, time_of_last_full_backup);
+                        open_and_list_dir(new, skip_these, fout,
+                                          time_of_last_full_backup);
                     } else {
-                        if (time_of_last_full_backup == 0 || time_of_last_full_backup < statbuf.st_ctime) {
+                        if (time_of_last_full_backup == 0
+                            || time_of_last_full_backup <
+                            statbuf.st_ctime) {
                             log_msg(10, "Found child file ***%s**** parsed", new);
                             fprintf(fout, "%s\n", new);
@@ -1441 +1468 @@
                                 uberctr++;
                                 mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
+#ifndef _XWIN
                                 if (!g_text_mode) {
-                                    newtDrawRootText(77, g_noof_rows - 3, tmp);
+                                    newtDrawRootText(77, g_noof_rows - 3,
+                                                     tmp);
                                     newtRefresh();
                                 }
-                                mr_free(tmp);
+#endif
+                                paranoid_free(tmp);
                             }
                         }
@@ -1451 +1481 @@
                 }
             }
-            mr_free(new);
-        }
-    }
-    mr_free(new_with_pipe);
-    mr_free(skip_these);
+            paranoid_free(new);
+        }
+    }
+    paranoid_free(new_with_pipe);
+    paranoid_free(skip_these);
     mr_free(dir);
 
@@ -1466 +1496 @@
     if (!depth) {
         close_evalcall_form();
+        paranoid_free(name_of_evalcall_form);
+        paranoid_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1493 +1525 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist;
+    char *sz_filelist, *tmp;
     char *exclude_paths = NULL;
     FILE *fout;
@@ -1502 +1534 @@
     char *tmp2 = NULL;
 
+    malloc_string(tmp);
+    malloc_string(g_skeleton_filelist);
     mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
-        fatal_error("Please supply either include_paths or userdef_filelist");
-    }
-    // make hole for filelist
+        fatal_error
+            ("Please supply either include_paths or userdef_filelist");
+    }
+// make hole for filelist
     mr_asprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
@@ -1522 +1557 @@
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile);
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile,
+                    sz_datefile);
             paranoid_system(command);
             mr_free(command);
@@ -1531 +1567 @@
                                   ("date +%s"));
     } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
+        log_msg(2,
+                "Warning - unable to find date of previous backup. Full backup instead.");
         differential = 0;
         time_of_last_full_backup = 0;
@@ -1542 +1579 @@
 // use user-specified filelist (if specified)
     if (userdef_filelist) {
-        log_msg(1, "Using the user-specified filelist - %s - instead of calculating one", userdef_filelist);
+        log_msg(1,
+                "Using the user-specified filelist - %s - instead of calculating one",
+                userdef_filelist);
         mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
@@ -1550 +1589 @@
         mr_free(command);
     } else {
-        if (include_paths) {
-            log_msg(2, "include_paths = '%s'", include_paths);
-        }
+        log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
         mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
@@ -1560 +1597 @@
             log_msg(2, "Found windows FS: %s",tmp2);
             mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
-            mr_free(tmp2);
+            paranoid_free(tmp2);
             mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
 
         mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
@@ -1570 +1607 @@
             mr_strcat(exclude_paths,"|%s",excp);
         }
-        mr_free(tmp2);
+        paranoid_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2, "Generating skeleton filelist so that we can track our progress");
-        mr_asprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
+        log_msg(2,
+                "Generating skeleton filelist so that we can track our progress");
+        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_skeleton_filelist);
-
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
         log_msg(2, "Opening out filelist to %s", sz_filelist);
@@ -1582 +1619 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        if ((include_paths != NULL) && (strlen(include_paths) == 0)) {
+        if (strlen(include_paths) == 0) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
@@ -1600 +1637 @@
             }
         }
-        mr_free(exclude_paths);
         paranoid_fclose(fout);
     }
@@ -1618 +1654 @@
     paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    mr_free(g_skeleton_filelist);
+    paranoid_free(exclude_paths);
+    paranoid_free(tmp);
+    paranoid_free(g_skeleton_filelist);
     log_msg(2, "Exiting");
     return (0);
 }
-
 
 /**
@@ -1643 +1680 @@
 
     assert(bkpinfo != NULL);
-    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir,
+           bkpinfo->scratchdir);
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
@@ -1754 +1792 @@
     FILE *fin;
     FILE *fout;
-    char *fname = NULL;
-    char *tmp = NULL;
-
+    char *fname;
+    char *tmp;
+    size_t len = 0;             // Scrub's patch doesn't work without that
+
+//  log_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
+    malloc_string(fname);
+    malloc_string(tmp);
     log_msg(5, "starting");
     log_msg(5, "needles_list_fname = %s", needles_list_fname);
@@ -1767 +1809 @@
     }
     while (!feof(fin)) {
-        mr_getline(fname, fin);
+//      fscanf(fin, "%s\n", fname);
+        len = MAX_STR_LEN - 1;
+        if (getline(&fname, &len, fin)) {
+            // FIXME
+        }
         if (!use_star) {
             if (fname[0] == '/') {
-                mr_asprintf(tmp, "%s", fname);
+                strcpy(tmp, fname);
             } else {
-                mr_asprintf(tmp, "/%s", fname);
+                tmp[0] = '/';
+                strcpy(tmp + 1, fname);
             }
-            mr_free(fname);
-            fname = tmp;
+            strcpy(fname, tmp);
         }
         while (strlen(fname) > 0 && fname[strlen(fname) - 1] < 32) {
@@ -1786 +1832 @@
             if (found_node->selected) {
                 if (fname[0] == '/') {
-                    mr_asprintf(tmp, "%s", fname + 1);
-                    mr_free(fname);
-                    fname = tmp;
+                    strcpy(tmp, fname + 1);
+                    strcpy(fname, tmp);
                 }
                 log_msg(5, "Found '%s'", fname);
-                tmp = mr_stresc(fname, "[]*?", '\\', "'");
-                mr_free(fname);
-                fname = tmp;
-                fprintf(fout, "%s\n", fname);
+                turn_wildcard_chars_into_literal_chars(tmp, fname);
+                fprintf(fout, "%s\n", tmp);
                 retval++;
             }
         }
-        mr_free(fname);
     }
     paranoid_fclose(fout);
     paranoid_fclose(fin);
+    paranoid_free(fname);
+    paranoid_free(tmp);
     return (retval);
 }
+
+
+
 
 
@@ -1818 +1865 @@
                                   char *list_of_files_fname, bool flag_em)
 {
-    FILE *fin = NULL;
-    char *tmp = NULL;
-    struct s_node *nod = NULL;
-
+    FILE *fin;
+    char *tmp;
+    char *p;
+    struct s_node *nod;
+
+    malloc_string(tmp);
     log_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
@@ -1827 +1876 @@
         return (1);
     }
-    for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
+    for (p = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
+         p = fgets(tmp, MAX_STR_LEN, fin)) {
         if (!tmp[0]) {
-            mr_free(tmp);
             continue;
         }
-        if ((strlen(tmp) > 0) && (tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)) {
+        if ((tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)
+            && strlen(tmp) > 0) {
             tmp[strlen(tmp) - 1] = '\0';
         }
         log_msg(2, "tmp = '%s'", tmp);
         if (!tmp[0]) {
-            mr_free(tmp);
             continue;
         }
@@ -1851 +1900 @@
             log_msg(5, "Flagged '%s'", tmp);
         }
-        mr_free(tmp);
-    }
-    mr_free(tmp);
+    }
     paranoid_fclose(fin);
+    paranoid_free(tmp);
     return (0);
 }