Changeset 863 in MondoRescue for trunk/mondo/src/common

Timestamp:

Oct 2, 2006, 12:26:44 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r838:862 $SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• libmondo-filelist.c (modified) (1 diff)
• libmondo-string.c (modified) (2 diffs)
• mr_string.c (modified) (1 diff)

trunk/mondo/src/common/libmondo-filelist.c

@@ -457 +457 @@
         }
         log_msg(8, "Analyzing %s", file_to_analyze);
-        asprintf(&tmp, "%s 2>> /dev/null", syscall_sprintf);
-        asprintf(&syscall, tmp, file_to_analyze);
-        paranoid_free(tmp);
+        /* BERLIOS : to be checked */
+        asprintf(&syscall, "%s %s 2>> /dev/null", syscall_sprintf,mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         call_exe_and_pipe_output_to_fd(syscall, pout);
         paranoid_free(syscall);

trunk/mondo/src/common/libmondo-string.c

@@ -93 +93 @@
     for (p = in_out; *p == ' '; p++);
     asprintf(&scratch, p);
+    strip_spaces (scratch);
     len = (int) strlen(scratch);
     mid = width / 2;
@@ -103 +104 @@
     paranoid_free(scratch);
     in_out = out;
+    for (i = x + len ; i < width - 1; i++) {
+            in_out[i] = ' ';
+        }
+    in_out[i] = '\0';
 }
 

trunk/mondo/src/common/mr_string.c

@@ -67 +67 @@
                 // Found it, skip the rest.
                 cnt++;
+                inptr++;
                 break;
             }