Changeset 1689 in MondoRescue for branches/2.2.5

Timestamp:

Oct 20, 2007, 8:13:28 PM (17 years ago)

Author:

Bruno Cornec

Message:

Compilation fixes

Location:

branches/2.2.5/mondo/src/common

Files:

• libmondo-archive.c (modified) (5 diffs)
• libmondo-fork-EXT.h (modified) (1 diff)
• libmondo-fork.h (modified) (1 diff)

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -972 +972 @@
         fatal_error("Unknown backup_media_type");
     }
-    if (bkpinfo->backup_media_type == usb) {
-           asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
-   } else {
-           asprintf(&tmp2,"");
-   }
--
+    if (bkpinfo->backup_media_type == usb) {
+        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+    } else {
+        asprintf(&tmp2," ");
+    }
 
     sprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
@@ -1867 +1866 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *old_pwd;
@@ -1901 +1901 @@
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
-    paranoid_free(tmp1);
 
     if (bkpinfo->nonbootable_backup) {
@@ -1908 +1907 @@
         log_msg(1, "Making bootable backup");
 
-        asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, ); /* Command to execute */
+        asprintf(&tmp,"cp -rp %s/* %s", bkpinfo->scratchdir, tmp1); /* Command to execute */
         res = eval_call_to_make_USB(tmp, message_to_screen);
         if (res) {
@@ -1921 +1920 @@
     }
     paranoid_free(message_to_screen);
+    paranoid_free(tmp1);
 
     if (is_this_device_mounted(bkpinfo->media_device)) {

branches/2.2.5/mondo/src/common/libmondo-fork-EXT.h

@@ -5 +5 @@
                                          char *what_i_am_doing);
 extern int run_program_and_log_output(char *program, int);
+extern int eval_call_to_make_USB(char *call,
+                                 char *what_i_am_doing);
 extern int eval_call_to_make_ISO(char *basic_call, char *isofile,
                                  int cd_no, char *logstub,

branches/2.2.5/mondo/src/common/libmondo-fork.h

@@ -8 +8 @@
 int run_program_and_log_to_screen(char *basic_call, char *what_i_am_doing);
 int run_program_and_log_output(char *program, int);
+int eval_call_to_make_USB(char *call, char *what_i_am_doing);
 int eval_call_to_make_ISO(char *basic_call, char *isofile,
                           int cd_no, char *logstub, char *what_i_am_doing);