Changeset 2404 in MondoRescue

Timestamp:

Sep 17, 2009, 2:23:18 AM (15 years ago)

Author:

Bruno Cornec

Message:

• At restore time read the netfs protocol in the conf file
• 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.

(Backports from 2.2.9)

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-filelist.c (modified) (4 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -1345 +1345 @@
     time_t this_time;
 
+    /* dir is needed when we pass it to the shell */
     dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
     p = strrchr(dir, '/');
@@ -1382 +1383 @@
         mr_free(tmp1);
 
-        mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir);
+        mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
         open_evalcall_form(name_of_evalcall_form);
         mr_free(name_of_evalcall_form);
@@ -1403 +1404 @@
                 last_time = this_time;
                 if (!g_text_mode) {
-                    mr_asprintf(tmp, "Reading %-68s", dir);
+                    mr_asprintf(tmp, "Reading %-68s", dir1);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     mr_free(tmp);
@@ -1421 +1422 @@
         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);
         mr_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);
             }
             mr_free(new_with_spaces);

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

@@ -749 +749 @@
         bkpinfo->backup_media_type = netfs;
         bkpinfo->please_dont_eject = TRUE;
+        mr_free(value);
+
+        mr_free(bkpinfo->netfs_proto);
+        if ((value = read_cfg_var(cfg_file, "netfs-proto")) == 0) {
+            mr_asprintf(bkpinfo->netfs_proto, "%s", value);
+        } else {
+            /* For compatibility, force protocol in old nfs case to be transparent */
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
+        mr_free(value);
+
         mr_free(bkpinfo->prefix);
-        mr_free(value);
         if ((value = read_cfg_var(cfg_file, "iso-prefix")) == 0) {
             mr_asprintf(bkpinfo->prefix, "%s", value);
@@ -756 +766 @@
             mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
+        mr_free(value);
     
         tmp = call_program_and_get_last_line_of_output("cat " CMDLINE);
@@ -769 +780 @@
         }
         mr_free(tmp);
-    /* For compatibility, force protocol in old nfs case to be transparent */
-    if (!strcmp(value, "nfs")) {
-        mr_free(bkpinfo->netfs_proto);
-        mr_asprintf(bkpinfo->netfs_proto, "nfs");
-    }
 
     } else if (!strcmp(value, "tape")) {