Changeset 1241 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Mar 12, 2007, 2:22:55 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug for tape mangement where block size was missing during extract (Michel Loiseleur)
• Remove turn_wildcard_chars_into_literal_chars and use mr_stresc instead (based on an idea from Michel)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-filelist.c (modified) (3 diffs)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (1 diff)
• libmondo-string.h (modified) (1 diff)

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

@@ -451 +451 @@
         mr_msg(8, "Analyzing %s", file_to_analyze);
         /* BERLIOS : to be checked */
-        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", BACKSLASH));
         mr_asprintf(&sys_call, "%s 2>> /dev/null", strtmp);
         mr_free(strtmp);
@@ -1709 +1709 @@
 {
     int retval = 0;
-    struct s_node *found_node;
-    FILE *fin;
-    FILE *fout;
+    struct s_node *found_node = NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
     char *fname = NULL;
-    char *tmp;
+    char *tmp = NULL;
     size_t len = 0;             // Scrub's patch doesn't work without that
 
@@ -1750 +1750 @@
                 }
                 mr_msg(5, "Found '%s'", fname);
-                turn_wildcard_chars_into_literal_chars(tmp, fname);
+                tmp = mr_stresc(fname, WILDCHARS, BACKSLASH);
                 fprintf(fout, "%s\n", tmp);
                 mr_free(tmp);

branches/stable/mondo/src/common/libmondo-string-EXT.h

@@ -39 +39 @@
 
 extern char *media_descriptor_string(t_bkptype);
-
-extern inline void turn_wildcard_chars_into_literal_chars(char *out,
-                                                          char *in);

branches/stable/mondo/src/common/libmondo-string.c

@@ -103 +103 @@
         }
     in_out[i] = '\0';
-}
-
-
-inline void turn_wildcard_chars_into_literal_chars(char *strout, char *strin)
-{
-    char *p, *q;
-
-    for (p = strin, q = strout; *p != '\0'; *(q++) = *(p++)) {
-        if (strchr("[]*?", *p)) {
-            *(q++) = '\\';
-        }
-    }
-    *q = *p;                    // for the final '\0'
 }
 

branches/stable/mondo/src/common/libmondo-string.h

@@ -32 +32 @@
 char *percent_media_full_comment(struct s_bkpinfo *bkpinfo);
 char *media_descriptor_string(t_bkptype);
-inline void turn_wildcard_chars_into_literal_chars(char *out, char *in);