Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-files.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-files.c (modified) (10 diffs)

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

@@ -51 +51 @@
     /*@ pointers **************************************************** */
     char *p = NULL;
+    char *q;
     FILE *fin;
 
@@ -126 +127 @@
     char *command = NULL;
     char *incoming = NULL;
+    char *q;
 
     /*@ long ******************************************************** */
@@ -204 +206 @@
     char *tmp = NULL;
     char *incoming = NULL;
+    char *q;
 
     /*@ int ********************************************************* */
@@ -471 +474 @@
     char *output = NULL;
     char *command = NULL;
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -540 +544 @@
     char *curr_cksum = NULL;
     char *tmp = NULL;
+    char *q;
 
     /*@ long [long] ************************************************* */
@@ -679 +684 @@
     /*@ buffers **************************************************** */
     char *incoming = NULL;
+    char *p = NULL;
 
     /*@ end vars *************************************************** */
@@ -743 +749 @@
     char *tmp = NULL;
     char *command = NULL;
+    char *comment;
 
     /*@ long ******************************************************** */
@@ -972 +979 @@
         return (1);
     }
-    fscanf(fin, "%s\n", contents);
+    res = fscanf(fin, "%s\n", contents);
     i = strlen(contents);
     if (i > 0 && contents[i - 1] < 32) {
@@ -978 +985 @@
     }
     paranoid_fclose(fin);
+    res = 0;
     return (res);
 }
@@ -1020 +1028 @@
     if (res) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
+    }
+
+    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+
+    if (run_program_and_log_output(command, FALSE)) {
+        fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }