Changeset 2402 in MondoRescue for branches/2.2.9/mondo

Timestamp:

Sep 16, 2009, 1:04:17 PM (16 years ago)

Author:

Bruno Cornec

Message:

Use dir for shell related commands and dir1 for C related actions in open_and_list_dir to avoid missing some files with { in names e.g.

File:

• branches/2.2.9/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

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

@@ -1348 +1348 @@
     time_t this_time;
 
+    /* dir is needed when we pass it to the shell */
     dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
     p = strrchr(dir, '/');
@@ -1383 +1384 @@
             1 + atol(call_program_and_get_last_line_of_output(tmp));
         paranoid_free(tmp);
-        sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
+        sprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
         open_evalcall_form(name_of_evalcall_form);
         find_skeleton_marker[0] = '\0';
@@ -1409 +1410 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    mr_asprintf(&tmp, "Reading %-68s", dir);
+                    mr_asprintf(&tmp, "Reading %-68s", dir1);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);
@@ -1427 +1428 @@
         mr_asprintf(&skip_these, " %s ", sth);
     }
-    mr_asprintf(&new_with_spaces, " %s ", dir);
-    if ((dip = opendir(dir)) == NULL) {
-        mr_asprintf(&tmp,"opendir %s", dir);
+    mr_asprintf(&new_with_spaces, " %s ", dir1);
+    if ((dip = opendir(dir1)) == NULL) {
+        mr_asprintf(&tmp,"opendir %s", dir1);
         log_OS_error(tmp);
         paranoid_free(tmp);
     } else if (strstr(skip_these, new_with_spaces)) {
-        fprintf(fout, "%s\n", dir); // if excluded dir then print dir ONLY
+        fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
     } else {
-        fprintf(fout, "%s\n", dir);
+        fprintf(fout, "%s\n", dir1);
         while ((dit = readdir(dip)) != NULL) {
             i++;
-            if (strcmp(dir, "/")) {
-                mr_asprintf(&new,"%s/%s",dir,dit->d_name);
+            if (strcmp(dir1, "/")) {
+                mr_asprintf(&new,"%s/%s",dir1,dit->d_name);
             } else {
-                mr_asprintf(&new,"%s%s",dir,dit->d_name);
+                mr_asprintf(&new,"%s%s",dir1,dit->d_name);
             }
             paranoid_free(new_with_spaces);