Changeset 2413 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c

Timestamp:

Sep 20, 2009, 2:44:23 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove function turn_wildcard_chars_into_literal_chars and replace it with a call to mr_stresc more generic

File:

• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (3 diffs)

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

@@ -1761 +1761 @@
     FILE *fin;
     FILE *fout;
-    char *fname;
-    char *tmp;
-    size_t len = 0;
-
-    malloc_string(fname);
-    malloc_string(tmp);
+    char *fname = NULL;
+    char *tmp = NULL;
+
     log_msg(5, "starting");
     log_msg(5, "needles_list_fname = %s", needles_list_fname);
@@ -1777 +1774 @@
     }
     while (!feof(fin)) {
-//      fscanf(fin, "%s\n", fname);
-        len = MAX_STR_LEN - 1;
-        (void)getline(&fname, &len, fin);   // patch by Scrub
+        mr_getline(fname, fin);
         if (!use_star) {
             if (fname[0] == '/') {
-                strcpy(tmp, fname);
+                mr_asprintf(tmp, "%s", fname);
             } else {
-                tmp[0] = '/';
-                strcpy(tmp + 1, fname);
+                mr_asprintf(tmp, "/%s", fname);
             }
-            strcpy(fname, tmp);
+            mr_free(fname);
+            fname = tmp;
         }
         while (strlen(fname) > 0 && fname[strlen(fname) - 1] < 32) {
@@ -1798 +1793 @@
             if (found_node->selected) {
                 if (fname[0] == '/') {
-                    strcpy(tmp, fname + 1);
-                    strcpy(fname, tmp);
+                    mr_asprintf(tmp, "%s", fname + 1);
+                    mr_free(fname)
+                    fname = tmp;
                 }
                 log_msg(5, "Found '%s'", fname);
-                turn_wildcard_chars_into_literal_chars(tmp, fname);
-                fprintf(fout, "%s\n", tmp);
+                tmp = mr_stresc(fname, "[]*?", '\\');
+                mr_free(fname);
+                fname = tmp;
+                fprintf(fout, "%s\n", fname);
                 retval++;
             }
         }
+        mr_free(fname);
     }
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(fname);
-    paranoid_free(tmp);
     return (retval);
 }
-
-
-