Changeset 2190 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-filelist.c

Timestamp:

May 5, 2009, 3:56:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix lack of formating (discovered by the new Mandriva build process, and adopted here as well as it's good practice).

File:

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

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

@@ -26 +26 @@
 #include <errno.h>
 #include <stdio.h>
-
-
-/**
- * The maximum depth of directories to put in the skeleton filelist.
- * This is a balance between performance and a good progress indicator.
- */
-#define MAX_SKEL_DEPTH 3
 
 
@@ -1406 +1399 @@
         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",
-             dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+             dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&strtmp,
-             "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+             "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
         paranoid_free(find_excludes);
@@ -1427 +1420 @@
         log_msg(5, "entries = %ld", g_skeleton_entries);
         percentage = 0;
-    } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
+    } else  // update evalcall form if appropriate
     {
         sprintf(find_skeleton_marker,
@@ -1650 +1643 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
         if (strlen(tmp2) < 1) {
             asprintf(&tmp1," ");
@@ -1657 +1650 @@
             asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             paranoid_free(tmp2);
-            asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp1));
+            asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }