Changeset 3194 in MondoRescue

Timestamp:

Sep 29, 2013, 7:27:11 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix all compilation/link error due to the previous giant merge with 3.1. 3.2 is ready to test

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (7 diffs)
• common/libmondo-devices.h (modified) (1 diff)
• common/libmondo-filelist.c (modified) (2 diffs)
• common/libmondo-files.c (modified) (29 diffs)
• common/libmondo-fork.c (modified) (1 diff)
• common/libmondo-stream.c (modified) (1 diff)
• common/libmondo-string-EXT.h (modified) (1 diff)
• common/libmondo-string.c (modified) (2 diffs)
• common/libmondo-string.h (modified) (1 diff)
• common/libmondo-tools.c (modified) (8 diffs)
• common/libmondo-verify.c (modified) (1 diff)
• common/newt-specific.c (modified) (2 diffs)
• lib/mr_str.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (2 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (3 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (5 diffs)
• mondorestore/mondorestore.c (modified) (11 diffs)
• mondorestore/mr-externs.h (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-cli.c

@@ -75 +75 @@
     int res = 0;
     int retval = 0;
-    int i = 0, j;
+    int i = 0;
 
     /*@ buffers *************** */
-    char *tmp = NULL;
     char flag_val[128][MAX_STR_LEN];
     bool flag_set[128];

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -884 +884 @@
     if (!tmp[0]) {
         mr_free(tmp);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
     }
     if (tmp[0]) {
@@ -2400 +2400 @@
 
         /* Initiate bkpinfo netfs_mount path from running environment if not already done */
-        if (!bkpinfo->netfs_mount == NULL) {
-            mr_asprintf(bkpinfo->netfs_mount, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (bkpinfo->netfs_mount == NULL) {
+            mr_asprintf(bkpinfo->netfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -2417 +2417 @@
             }
             mr_free(bkpinfo->netfs_mount);
-            mr_asprintf(bkpinfo->netfs_mount, "%s", p;
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
             if (!bkpinfo->restore_data) {
                 if ((compression_type = which_compression_type()) == NULL) {
@@ -2448 +2448 @@
 
             if (!bkpinfo->restore_data) {
-                mr_sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);   // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
                 strcpy(tmp1, sz_size);
@@ -2496 +2496 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1)) {
+        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2556 +2556 @@
             finish(1);
         }
-        strcpy(bkpinfo->netfs_remote_dir, tmp1);
+        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", tmp1);
 
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces(bkpinfo->netfs_remote_dir);
+        mr_strip_spaces(bkpinfo->netfs_remote_dir);
 
         if (!popup_and_get_string
@@ -2820 +2820 @@
 
     /* Handle devices passed in bkpinfo and print result */
-    /*  the mr_make_devlist_from_pathlist function appends
+    /*  the mr_make_devlist_from_pathlist function appends */
     /*  to the *_paths variables so copy before */
     mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');

branches/3.2/mondo/src/common/libmondo-devices.h

@@ -12 +12 @@
 long get_phys_size_of_drive(char *drive);
 bool is_this_a_valid_disk_format(char *format);
-int mount_CDROM_here(char *device, char *mountpoint);
+int mount_CDROM_here(char *device, const char *mountpoint);
 int find_device_in_mountlist(struct mountlist_itself *mountlist,
                              char *device);

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

@@ -439 +439 @@
     char *syscall = NULL;
     char *file_to_analyze = NULL;
-    char *strtmp = NULL;
     char *tmp = NULL;
     int i;
@@ -1791 +1790 @@
                 }
                 log_msg(5, "Found '%s'", fname);
-                tmp = mr_stresc(fname, "[]*?", '\\', "'");
+                tmp = mr_stresc(fname, "[]*?", '\\', '\'');
                 mr_free(fname);
                 fname = tmp;

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

@@ -291 +291 @@
     log_it("Calling Mindi with kernel path of '%s'", kernel);
     while (!kernel[0]) {
-        if (!ask_me_yes_or_no
-            ("Kernel not found or invalid. Choose another?")) {
+        if (!ask_me_yes_or_no("Kernel not found or invalid. Choose another?")) {
             return (1);
         }
-        if (!popup_and_get_string
-            ("Kernel path",
-             "What is the full path and filename of your kernel, please?",
-             kernel, MAX_STR_LEN / 4)) {
-            fatal_error
-                ("Kernel not found. Please specify with the '-k' flag.");
+        if (!popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel, MAX_STR_LEN / 4)) {
+            fatal_error("Kernel not found. Please specify with the '-k' flag.");
         }
         log_it("User says kernel is at %s", kernel);
@@ -335 +330 @@
             mr_free(incoming);
             output[0] = '\0';
-            return (NULL);      // forget it :)
+            return(NULL);       // forget it :)
         }
         mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-        mr_free(incomig);
+        mr_free(incoming);
 
         mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
@@ -352 +347 @@
     strcpy(output, incoming);
     if (output[0] != '\0' && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, incoming);
+        log_msg(4, "find_home_of_exe --- Found %s at %s", fname, incoming);
     } else {
         output[0] = '\0';
-        log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
+        log_msg(4, "find_home_of_exe --- Could not find %s", fname);
     }
     mr_free(incoming);
     if (!output[0]) {
-        return (NULL);
+        return(NULL);
     } else {
-        return (output);
+        return(output);
     }
 }
@@ -433 +428 @@
         if (!lastline[0]) {
             mr_free(lastline);
-            return (0);
+            return(0);
         }
     } else {
@@ -444 +439 @@
     } else {
         mr_free(lastline);
-        return (0);
+        return(0);
     }
 
@@ -453 +448 @@
     i = atoi(p);
     mr_free(lastline);
-    return (i);
+    return(i);
 }
 
@@ -471 +466 @@
     static char output[MAX_STR_LEN];
     char *command = NULL;
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -478 +474 @@
 
     if (!does_file_exist(filename)) {
-        log_it("Tring to get last line of nonexistent file (%s)", filename);
+        log_it("Trying to get last line of nonexistent file (%s)", filename);
         output[0] = '\0';
         return (output);
@@ -493 +489 @@
         output[strlen(output) - 1] = '\0';
     }
-    return (output);
+    return(output);
 }
 
@@ -513 +509 @@
         log_it("filename=%s", filename);
         log_OS_error("Unable to openin filename");
-        return (-1);
+        return(-1);
     }
     fseeko(fin, 0, SEEK_END);
     length = ftello(fin);
     paranoid_fclose(fin);
-    return (length);
+    return(length);
 }
 
@@ -561 +557 @@
         log_OS_error("Unable to fopen-in filelist");
         log_to_screen("Can't open filelist");
-        return (1);
+        return(1);
     }
     fout = fopen(cksumlist, "w");
@@ -568 +564 @@
         paranoid_fclose(fin);
         log_to_screen("Can't open checksum list");
-        return (1);
+        return(1);
     }
     for (mr_getline(stub_fname, fin); !feof(fin); mr_getline(stub_fname, fin)) {
-        if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
+        i = strlen(stub_fname) - 1;
+        if (stub_fname[i] < 32) {
             stub_fname[i] = '\0';
         }
@@ -605 +602 @@
     paranoid_fclose(fin);
     log_it("Done.");
-    return (0);
+    return(0);
 }
 
@@ -623 +620 @@
     res = system(tmp);
     mr_free(tmp);
-    return (res);
+    return(res);
 }
 
@@ -659 +656 @@
 
     unlink(outfile_fname);
-    return (0);
+    return(0);
 }
 
@@ -687 +684 @@
     if (!fin) {
         log_OS_error("Unable to openin filelist_fname");
-        return (0);
+        return(0);
     }
     mr_getline(incoming, fin);
@@ -699 +696 @@
     mr_free(incoming);
     paranoid_fclose(fin);
-    return (matches);
+    return(matches);
 }
 
@@ -728 +725 @@
     mr_free(command);
 
-    return (file_len_K);
+    return(file_len_K);
 }
 
@@ -806 +803 @@
     paranoid_fclose(fin);
     log_it("Finished calculating total size of all biggiefiles");
-    return (scratchL);
+    return(scratchL);
 }
 
@@ -848 +845 @@
     mr_free(command);
 
-    return (llres);
+    return(llres);
 }
 
@@ -864 +861 @@
     tmp = (crc >> 8) ^ c;
     crc = (crc << 8) ^ crctttab[tmp & 255];
-    return crc;
+    return(crc);
 }
 
@@ -879 +876 @@
     tmp = crc ^ c;
     crc = (crc >> 8) ^ crc16tab[tmp & 0xff];
-    return crc;
+    return(crc);
 }
 
@@ -905 +902 @@
         log_to_screen("There may be hyperlink at http://www.mondorescue.org which");
         log_to_screen("will take you to the relevant (missing) package.");
-        return (1);
+        return(1);
     } else {
-        return (0);
+        return(0);
     }
 }
@@ -969 +966 @@
         log_it("fname=%s", fname);
         log_OS_error("Unable to openin fname");
-        return (1);
+        return(1);
     }
     res = fscanf(fin, "%s\n", contents);
@@ -978 +975 @@
     paranoid_fclose(fin);
     res = 0;
-    return (res);
-}
-
-
-
+    return(res);
+}
 
 
@@ -1084 +1078 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 }
-
-
-
 
 
@@ -1115 +1106 @@
     char *p;
 
-    if (! bkpinfo->netfs_mount) {
+    if (bkpinfo->netfs_mount == NULL) {
         fatal_error("No netfs_mount found !");
     }
@@ -1152 +1143 @@
 
     mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
-    mr_asprintf(netfs_client_hwaddr, "%s" call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_hwaddr, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
@@ -1229 +1220 @@
     mr_free(tmp);
 
-    sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
     mr_free(tmp);

branches/3.2/mondo/src/common/libmondo-fork.c

@@ -43 +43 @@
     /*@ pointers **************************************************** */
     FILE *fin = NULL;
-    int res = 0;
 
     /*@ initialize data ********************************************* */

branches/3.2/mondo/src/common/libmondo-stream.c

@@ -282 +282 @@
 
     mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1", cdr_exe);
-    mr_asprintf(tmp, "%s", all_program_and_get_last_line_of_output(command));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 

branches/3.2/mondo/src/common/libmondo-string-EXT.h

@@ -31 +31 @@
 
 extern int compare_two_filelist_entries(void *va, void *vb);
-extern int severity_of_difference(char *filename, char *out_reason);
-
+extern int severity_of_difference(char *filename, char **out_reason);
 extern char *percent_media_full_comment();
 

branches/3.2/mondo/src/common/libmondo-string.c

@@ -866 +866 @@
  * @return The severity (1-3).
  */
-int severity_of_difference(char *fn, char *out_reason) {
+int severity_of_difference(char *fn, char **out_reason) {
 
     int sev = 3;
@@ -971 +971 @@
     }
     if (out_reason) {
-        strcpy(out_reason, reason);
+        strcpy(*out_reason, reason);
     }
     mr_free(filename);

branches/3.2/mondo/src/common/libmondo-string.h

@@ -26 +26 @@
 
 int compare_two_filelist_entries(void *va, void *vb);
-int severity_of_difference(char *filename, char *out_reason);
+int severity_of_difference(char *filename, char **out_reason);
 
 char *percent_media_full_comment();

branches/3.2/mondo/src/common/libmondo-tools.c

@@ -34 +34 @@
 extern int g_current_media_number;
 extern char *MONDO_LOGFILE;
-extern char *g_serial_string;
 
 /* Reference to global bkpinfo */
@@ -61 +60 @@
  * The serial string (used to differentiate between backups) of the current backup.
  */
-char *g_serial_string = NULL;
+extern char *g_serial_string;
 
 /**
@@ -359 +358 @@
     char *cdr_exe = NULL;
     char *tmp = NULL;
-    char *p = NULL;
     char *call_before_iso_user = NULL;
     char *iso_dev = NULL;
@@ -633 +631 @@
                 mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
                 mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
-                strcpy(bkpinfo->netfs_mount, ip_address);
-                mr_free(ip_address);
+                mr_free(bkpinfo->netfs_mount);
+                bkpinfo->netfs_mount = ip_address;
             }
         }
@@ -801 +799 @@
 void reset_bkpinfo()
 {
-    int i;
     log_msg(1, "Initializing bkpinfo");
 
@@ -824 +821 @@
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
     
-/*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir = NULL;         // Really setup after
+    /*  We need tmpdir as early as possible for further function calls */
+    bkpinfo->tmpdir[0]= '\0';           // Really setup after
+    bkpinfo->scratchdir[0]= '\0';           // Really setup after
     setup_tmpdir(NULL);
     setup_scratchdir(NULL);
@@ -848 +846 @@
     bkpinfo->call_after_iso[0] = '\0';
     bkpinfo->kernel_path[0] = '\0';
-    bkpinfo->netfs_mount[0] = '\0';
+    bkpinfo->netfs_mount = NULL;
     bkpinfo->netfs_proto = NULL;
     bkpinfo->netfs_user = NULL;
-    bkpinfo->netfs_remote_dir[0] = '\0';
+    bkpinfo->netfs_remote_dir = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->subdir = NULL;
@@ -1365 +1363 @@
  * Function pointer to the @c log_debug_msg function to use. Points to standard_log_debug_msg() by default.
  */
-void (*log_debug_msg) (int, const char *, const char *, int, const char *,
-                       ...) = standard_log_debug_msg;
+void (*log_debug_msg) (int, const char *, const char *, int, const char *, ...) = standard_log_debug_msg;
 
 

branches/3.2/mondo/src/common/libmondo-verify.c

@@ -412 +412 @@
     char *outlog = NULL;
     char *tmp = NULL;
-    char *p = NULL;
 
     /*@ pointers ******************************************************* */

branches/3.2/mondo/src/common/newt-specific.c

@@ -20 +20 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -1579 +1580 @@
                     if (filelist->entries > 0) {
                         malloc_string(reason);
-                        severity_of_difference(filelist->el[currline].  filename, &reason);
+                        severity_of_difference(filelist->el[currline].filename, &reason);
                         mr_asprintf(tmp, "%s --- %s", filelist->el[currline].filename, reason);
 

branches/3.2/mondo/src/lib/mr_str.c

@@ -222 +222 @@
     length = strlen(in_out);
 
-    /* Skip initial caracs */
+    // Skip initial caracs
     for (i = 0; index(caracs, in_out[i]) != NULL && i < (int)length ; i++);
 
-    /* Shift the string to the begining if needed */
+    // Shift the string to the begining if needed
     if (i != 0) {
         for (j = 0; i < (int)length ; i++, j++) {
             in_out[j] = in_out[i];
         }
-        /* Erase the end of the string if needed */
+        // Erase the end of the string if needed
         j++;
         in_out[j] = '\0';
     }
 
-    /* Skip final caracs */
+    // Skip final caracs
     for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
 
-    /* The string now ends after that char */
+    // The string now ends after that char
     i++;
     in_out[i] = '\0';

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -161 +161 @@
     char *tmp1 = NULL;
     int res = 0;
-    int i = 0;
     int retval = 0;
     char *say_at_end = NULL;
@@ -243 +242 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
-        tmp1 = mr_stresc(argv[2], "[]*?", '\\');
+        tmp1 = mr_stresc(argv[2], "[]*?", '\\', '\'');
         printf("in=%s; out=%s\n", argv[2], tmp1);
         mr_free(tmp1);

branches/3.2/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -90 +90 @@
         newtRefresh();
     }
-    if (checksum == NULL]) {
+    if (checksum == NULL) {
         log_msg(2, "Warning - %s has no checksum", bigfile_fname);
     }
@@ -235 +235 @@
     char *tmp = NULL;
     char *archiver_exe = NULL;
-    char *tmp1 = NULL;
     char *logfile = NULL;
     char *compressor_exe = NULL;
@@ -241 +240 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%d", current_tarball_number);
 
     if (strstr(tarball_fname, ".bz2")) {

branches/3.2/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2632 +2632 @@
     char sz_res[MAX_STR_LEN];
     char *header_text = NULL;
-    char *p = NULL;
 
   /** int **************************************************************/
@@ -2736 +2735 @@
         memcpy((void *) disklist, (void *) bkp_disklist, sizeof(struct list_of_disks));
     }
-    paranoid_free(sz_res);
     mr_free(bkp_raidrec);
     mr_free(bkp_disklist);

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -639 +639 @@
 /** add mallocs **/
 char value[MAX_STR_LEN];
-char *tmp = NULL;
 char *tmp1 = NULL;
 char *envtmp1 = NULL;
@@ -936 +935 @@
             log_it("command = %s", command);
             log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-            mr_strcpy(iso_mnt, call_program_and_get_last_line_of_output(command));
+            sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
             mr_free(command);
         } else {
-            mr_asprintf(iso_mnt, "/tmp/isodir");
+            sprintf(iso_mnt, "/tmp/isodir");
             mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
             run_program_and_log_output(tmp1, 5);
@@ -979 +978 @@
 }
 g_backup_media_type = bkpinfo->backup_media_type;
-paranoid_free(value);
-paranoid_free(iso_mnt);
-paranoid_free(iso_path);
 return (0);
 
@@ -2053 +2049 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_sprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(command,    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2103 +2099 @@
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    mr _asprintf(command, "mkdir -p %s", mountpt);
+    mr_asprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
     mr_free(command);

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -431 +431 @@
   /** needs malloc **********/
     char *tmp;
-    char *p = NULL;
     char *tmp1 = NULL;
     char *fstab_fname = NULL;
@@ -460 +459 @@
     log_it("Done loading config file; resizing ML");
 
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE);
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
     if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
@@ -578 +577 @@
                 strcpy(tmp, old_restpath);
                 // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
-                if (popup_and_get_string
-                    ("Restore path", "Restore files to where?", tmp,
-                     MAX_STR_LEN / 4)) {
+                if (popup_and_get_string("Restore path", "Restore files to where?", tmp, MAX_STR_LEN / 4)) {
                     if (!strcmp(tmp, "/")) {
                         if (!ask_me_yes_or_no("Are you sure?")) {
@@ -788 +785 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
+            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
             if (strstr(tmp1, "nopart")) {
                 log_msg(2, "Not partitioning drives due to 'nopart' option.");
@@ -860 +857 @@
 
   after_the_nuke:
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
@@ -912 +909 @@
     strcpy(bkpinfo->restore_path, "/");
     if (!g_restoring_live_from_cd && !g_restoring_live_from_netfs) {
-        popup_and_OK
-            ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
+        popup_and_OK("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
     }
@@ -940 +936 @@
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
-        if (popup_and_get_string("Restore path",
-                                 "Restore files to where? )",
-                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
+        if (popup_and_get_string("Restore path", "Restore files to where? ", bkpinfo->restore_path, MAX_STR_LEN / 4)) {
             log_it("Restoring everything");
             retval += restore_everything(filelist);
@@ -958 +952 @@
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(2,
-                "Tape : I don't need to unmount or eject the CD-ROM.");
+        log_msg(2, "Tape : I don't need to unmount or eject the CD-ROM.");
     } else {
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
@@ -987 +980 @@
  * @{
  */
+
 /**
  * Restore biggiefile @p bigfileno from the currently mounted CD.
@@ -998 +992 @@
  * @return 0 for success (or skip), nonzero for failure.
  */
-int
-restore_a_biggiefile_from_CD(long bigfileno,
+int restore_a_biggiefile_from_CD(long bigfileno,
                              struct s_node *filelist,
                              char *pathname_of_last_file_restored)
@@ -2204 +2197 @@
   /** malloc add ****/
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *biggie_fname;
     char *biggie_cksum;

branches/3.2/mondo/src/mondorestore/mr-externs.h

@@ -9 +9 @@
 #define BIGGIELIST MNT_CDROM"/archives/biggielist.txt"
 #define ARCHIVES_PATH MNT_CDROM"/archives"
+/*
 #define BIGGIELIST ARCHIVES_PATH"/biggielist.txt"
+*/
 
 #ifdef __FreeBSD__