Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-filelist.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-filelist.c (modified) (14 diffs)

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

@@ -29 +29 @@
 
 
+extern ssize_t getline(char **lineptr, size_t * n, FILE * stream);
 extern char *MONDO_LOGFILE;
 
@@ -451 +452 @@
         }
         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);
         mr_free(tmp);
-
-        mr_asprintf(syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
-        mr_free(strtmp);
-
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -480 +477 @@
         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);
@@ -496 +492 @@
         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);
@@ -1338 +1333 @@
 
     /* dir is needed when we pass it to the shell */
-    dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
+    dir = mr_stresc(dir1, "'", '\\', '\'');
     p = strrchr(dir1, '/');
     if (p) {
@@ -1346 +1341 @@
         }
     }
-    mr_asprintf(find_excludes, "|");
+    mr_asprintf(find_excludes, " ");
 
     if (!depth) {
-        mr_asprintf(find_excludes, "|");
         if (sth != NULL) {
-            while((token = mr_strtok(sth, delims, &lastpos))) {
+            while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
                 mr_strcat(find_excludes," -path %s -prune -o", token);
                 mr_free(token);
@@ -1365 +1359 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -maxdepth %d -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype devtmpfs -prune -o -fstype proc -prune -o -fstype selinuxfs -prune -o -fstype securityfs -prune -o -fstype hugetlbfs -o -fstype cgroup -prune -prune -o -fstype mqueue -prune -o -fstype debugfs -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
@@ -1422 +1416 @@
 //  log_msg(0, "Cataloguing %s", dir);
     mr_asprintf(skip_these, "|%s|", sth);
+    
     mr_asprintf(new_with_pipe, "|%s|", dir1);
     if ((dip = opendir(dir1)) == NULL) {
@@ -1441 +1436 @@
             }
             mr_free(new_with_pipe);
+            mr_asprintf(new_with_pipe, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
@@ -1493 +1489 @@
 
 
-
 /**
  * Create the filelist for the backup. It will be stored in [scratchdir]/archives/filelist.full.
@@ -1592 +1587 @@
         mr_asprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
         make_hole_for_file(g_skeleton_filelist);
+
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
         log_msg(2, "Opening out filelist to %s", sz_filelist);
@@ -1597 +1593 @@
             fatal_error("Cannot openout to sz_filelist");
         }
-        if ((!include_paths) || (strlen(include_paths) == 0)) {
+        if ((include_paths != NULL) && (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
@@ -1668 +1664 @@
 
     if (bkpinfo->make_filelist) {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
+        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
+        res = mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 
@@ -1799 +1793 @@
                 }
                 log_msg(5, "Found '%s'", fname);
-                tmp = mr_stresc(fname, "[]*?", '\\');
+                tmp = mr_stresc(fname, "[]*?", '\\', "'");
                 mr_free(fname);
                 fname = tmp;