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

Timestamp:

Jul 28, 2013, 7:37:35 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #673 by improving single quote management in mr_stresc, and using single call for getfacl/getfattr and adding tests to test suite.

File:

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

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

@@ -470 +470 @@
         }
         log_msg(8, "Analyzing %s", file_to_analyze);
-        tmp = mr_stresc(file_to_analyze, " `$\\\"(){}[]'*?&|!#~", '\\');
-        mr_asprintf(&strtmp, syscall_sprintf, tmp);
+        tmp = mr_stresc(file_to_analyze, "'", '\\', '\'');
+        mr_asprintf(&syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);   // " MONDO_LOGFILE);
         paranoid_free(tmp);
-        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);  // " MONDO_LOGFILE);
-        paranoid_free(strtmp);
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -496 +494 @@
         mr_free(command);
 
-        retval =
-            gen_aux_list(filelist, "getfacl --all-effective -P \"%s\"",
-                         facl_fname);
+        retval = gen_aux_list(filelist, "getfacl --all-effective -P ", facl_fname);
     }
     return (retval);
@@ -513 +509 @@
         run_program_and_log_output(command, 8);
         mr_free(command);
-        retval =
-            gen_aux_list(filelist, "getfattr --en=hex -m - -h -d \"%s\"",
-                         fattr_fname);
+        retval = gen_aux_list(filelist, "getfattr --en=hex -m - -h -d ", fattr_fname);
     }
     return (retval);
@@ -1350 +1344 @@
 
     /* dir is needed when we pass it to the shell */
-    dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
+    dir = mr_stresc(dir1, "'", '\\', '\'');
     p = strrchr(dir1, '/');
     if (p) {