Changeset 2198 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

May 12, 2009, 2:56:51 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Protection of chains (file names) passed to system with mr_stresc which may contain strange chars.

File:

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

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

@@ -1349 +1349 @@
  * @bug Return value should be @c void.
  */
-int open_and_list_dir(char *dir, char *sth, FILE * fout,
+int open_and_list_dir(char *dir1, char *sth, FILE * fout,
                       time_t time_of_last_full_backup)
 {
@@ -1359 +1359 @@
     char *new;
     char *tmp;
+    char *dir = NULL;
     static int percentage = 0;
     char *skip_these;
@@ -1377 +1378 @@
     time_t this_time;
 
+    dir = mr_stresc(dir1, "`$\\\"", '\\');
     p = strrchr(dir, '/');
     if (p) {
@@ -1398 +1400 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&strtmp,
-             "find %s -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
+             "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
              dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&strtmp,
-             "find %s -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
+             "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
                 dir, find_excludes, g_skeleton_filelist);
 #endif
@@ -1423 +1425 @@
     {
         sprintf(find_skeleton_marker,
-                "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
+                "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_skeleton_filelist);
 //    log_msg(0, "fsm = %s", find_skeleton_marker);
@@ -1514 +1516 @@
     paranoid_free(new_with_spaces);
     paranoid_free(skip_these);
+    paranoid_free(dir);
 
     if (dip) {