Changeset 2320 in MondoRescue

Timestamp:

Aug 18, 2009, 2:37:39 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

Location:

branches/2.2.10/mondo

Files:

• src/common/libmondo-archive.c (modified) (11 diffs)
• src/common/libmondo-cli.c (modified) (45 diffs)
• src/common/libmondo-devices.c (modified) (3 diffs)
• src/common/libmondo-filelist.c (modified) (12 diffs)
• src/common/libmondo-tools.c (modified) (3 diffs)
• src/common/mondostructures.h (modified) (3 diffs)
• src/common/newt-specific.c (modified) (14 diffs)
• src/include/mr_mem.h (modified) (1 diff)
• src/lib/mr_err.c (modified) (2 diffs)
• src/lib/mr_mem.c (modified) (1 diff)
• src/mondoarchive/mondoarchive.c (modified) (1 diff)
• src/mondorestore/mondorestore.c (modified) (1 diff)
• test/test-mountlist.c (modified) (1 diff)
• test/test-truncname.c (modified) (1 diff)

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

@@ -337 +337 @@
         mr_asprintf(&zipparams, "");
     }
-
-//  make_hole_for_file(fname);
 
     if (!does_file_exist(bkpinfo->tmpdir)) {
@@ -543 +541 @@
 
     assert(bkpinfo != NULL);
-    mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
-    mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
-    mr_free(tmp);
-
-    mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
-    log_msg(2, tmp);
-    mr_free(tmp);
+    if (bkpinfo->exclude_paths) {
+        mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
+        mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
+        log_msg(2, tmp);
+        mr_free(tmp);
+    }
 
     mvaddstr_and_log_it(g_currentY, 0,
@@ -885 +885 @@
             last_filelist_number,   // parameter #12 (STRING)
             estimated_total_noof_slices,    // parameter #13 (INT)
-            devs_to_exclude,    // parameter #14
+            (devs_to_exclude == NULL) ? "\"\"" : devs_to_exclude,   // parameter #14
             use_comp_sz,        // parameter #15
             use_lilo_sz,        // parameter #16
@@ -920 +920 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
-                bkpinfo->scratchdir, MINDI_CACHE);
+        mr_asprintf(&command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
@@ -927 +926 @@
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images",
-                    bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 paranoid_free(command);
@@ -941 +939 @@
             paranoid_free(command);
         } else {
-            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
-                bkpinfo->tmpdir);
+            mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir, bkpinfo->tmpdir);
             if (system(tmp)) {
                 fatal_error("Cannot find all.tar.gz in tmpdir");
@@ -1689 +1686 @@
     }
 
-    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
-            bkpinfo->scratchdir, destfile);
+    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
@@ -1727 +1723 @@
         } else {
             res =
-                eval_call_to_make_ISO(bkpinfo->call_make_iso,
-                                      bkpinfo->scratchdir,
-                                      g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+                eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
             if (res) {
                 log_to_screen("%s...failed to write", message_to_screen);
@@ -1789 +1782 @@
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 res =
-                    eval_call_to_make_ISO(bkpinfo->call_make_iso,
-                                          bkpinfo->scratchdir,
-                                          g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                    eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 retval += res;
                 if (!bkpinfo->please_dont_eject) {
@@ -2378 +2367 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
-            bkpinfo->scratchdir);
+        mr_asprintf(&command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -3302 +3290 @@
     paranoid_fclose(fout);
 
-    mr_asprintf(&tmp1, "cp -f %s/autorun %s/", g_mondo_home,
-            bkpinfo->scratchdir);
+    mr_asprintf(&tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp1, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");

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

@@ -56 +56 @@
 static int get_dsf_mount_list (const char *dsf, char **included_dsf_list, char **excluded_dsf_list);
 static int create_list_of_non_NFS_mounted_file_systems (void);
-static MOUNTED_FS_STRUCT *find_mount_point_in_list (char *mount_point);
-static MOUNTED_FS_STRUCT *find_device_in_list (char *device);
+static MOUNTED_FS_STRUCT *find_mount_point_in_list (const char *mount_point);
+static MOUNTED_FS_STRUCT *find_device_in_list (const char *device);
 
 /* Do we use extended attributes and acl ? 
@@ -124 +124 @@
     mr_free(tmp);
 
-    sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
-            "/mondo.scratch.%ld", random() % 32767);
+    mr_strcat(bkpinfo->scratchdir, "/mondo.scratch.%ld", random() % 32767);
+
     mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
@@ -168 +168 @@
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
     }
-//      bkpinfo->media_size[0] = bkpinfo->media_size[MAX_NOOF_MEDIA];
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         if (bkpinfo->media_size[j] <= 0) {
@@ -189 +188 @@
     while (DSFptr != NULL) {
         DSFnext = DSFptr->next;
-        paranoid_free(DSFptr);
+        mr_free(DSFptr);
         DSFptr = DSFnext;
     }
@@ -221 +220 @@
  * structure if it did. 
  */
-static MOUNTED_FS_STRUCT *find_device_in_list (char *device)
+static MOUNTED_FS_STRUCT *find_device_in_list (const char *device)
 {
     MOUNTED_FS_STRUCT *DSFptr = NULL;
@@ -242 +241 @@
  * structure if it did. 
  */
-static MOUNTED_FS_STRUCT *find_mount_point_in_list (char *mount_point)
+static MOUNTED_FS_STRUCT *find_mount_point_in_list (const char *mount_point)
 {
     MOUNTED_FS_STRUCT *DSFptr = NULL;
@@ -283 +282 @@
     log_msg(5, "Running: %s", command);
     mr_asprintf(&mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_free(command);
 
     mount_cnt = atoi(mounted_file_system);
     log_msg (5, "mount_cnt: %d", mount_cnt);
-    paranoid_free(mounted_file_system);
+    mr_free(mounted_file_system);
 
     for (i=mount_cnt; i > 0; i--) {
@@ -293 +292 @@
         log_msg(5, "Running: %s", command);
         mr_asprintf(&mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
 
         log_msg (5, "mounted_file_system: %s", mounted_file_system);
         if ((token = strtok(mounted_file_system, token_chars)) == NULL) {
             log_msg (4, "Could not get the list of mounted file systems");
-            paranoid_free(mounted_file_system);
+            mr_free(mounted_file_system);
             mr_free(token);
             return (1);
@@ -315 +314 @@
             if ((token = strtok(NULL, token_chars)) == NULL) {
                 log_msg (5, "Ran out of entries on the mounted file systems list");
-                paranoid_free(mounted_file_system);
+                mr_free(mounted_file_system);
                 mr_free(token);
                 return (1);
@@ -324 +323 @@
             token = strtok(NULL, token_chars); 
         }
-        paranoid_free(mounted_file_system);
+        mr_free(mounted_file_system);
     }
     /********
@@ -377 +376 @@
     log_msg(5, "  Executing: %s", command);
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_free(command);
 
     log_msg(5, "  Return value: %s", tmp);
     c = atoi(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!c) {
@@ -403 +402 @@
     log_msg(4, "Executing: %s", command);
     mr_asprintf(&partition_list, "%s", call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
     if (!strlen(partition_list)) {
@@ -419 +418 @@
         mr_free(token);
     }
-    paranoid_free(partition_list);
+    mr_free(partition_list);
   
     /********
@@ -457 +456 @@
         log_msg(4, "  Running: %s", command);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         log_msg(4, "  Return value: %s", tmp);
         c = strlen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
+
         if (c) {
             log_msg(4, "It's swap. Ignoring partition %s", partitions[i]); 
@@ -468 +469 @@
         mr_asprintf(&command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         if (strlen(tmp)) {
             log_msg(4, "  %s is mounted: %s", partitions[i], tmp);
             if ((DSFptr = find_mount_point_in_list(tmp)) == NULL) {
                 log_msg (4, "Can't find mount point %s in mounted file systems list", tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (1);
             }
             DSFptr->check = 1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         /* It's not swap and it's not mounted. See if it's LVM */
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
@@ -487 +489 @@
         log_msg(4, "  Running: %s", command);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
         if (strlen(tmp)) {
             log_msg(4, "  Partition ID: %s", tmp);
@@ -496 +498 @@
                 log_msg(4, "  Running: %s", command);
                 strcpy(VG, call_program_and_get_last_line_of_output(command));
-                paranoid_free(command);
+                mr_free(command);
                 log_msg(4, "  Volume Group: %s", VG);
                 if (strlen(VG)) {
@@ -504 +506 @@
                     log_msg(4, "  Running: %s", command);
                     mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                    paranoid_free(command);
+                    mr_free(command);
                     log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
                     lastpos = 0;
@@ -511 +513 @@
                         if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
                             log_msg (4, "Can't find mount point %s in mounted file systems list", token);
-                            paranoid_free(tmp);
+                            mr_free(tmp);
                             mr_free(token);
                             return (1);
@@ -522 +524 @@
                      * any of the Logical Volumes on the Volume Group.
                      *******/
-                    paranoid_free(mount_list);
+                    mr_free(mount_list);
                     mr_asprintf(&command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                     log_msg (5, "Running: %s", command);
                     mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                    paranoid_free(command);
+                    mr_free(command);
                     log_msg(4, "  Software raid device list: %s", mount_list);
                     lastpos = 0;
@@ -532 +534 @@
                         mr_asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
                         log_msg (5, "Running: %s", command);
-                        paranoid_free(tmp);
+                        mr_free(tmp);
                         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-                        paranoid_free(command);
+                        mr_free(command);
                         log_msg(4, "Number of Software raid device: %s", tmp);
                         if (atoi(tmp)) {
@@ -540 +542 @@
                             if ((DSFptr = find_device_in_list(token)) == NULL) {
                                 log_msg (4, "Can't find device %s in mounted file systems list", token);
-                                paranoid_free(tmp);
+                                mr_free(tmp);
                                 mr_free(token);
                                 return (1);
@@ -548 +550 @@
                     }
                     mr_free(token);
-                    paranoid_free(mount_list);
+                    mr_free(mount_list);
                 } else {
                     log_msg (4, "Error finding Volume Group for partition %s", partitions[i]);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (1);
                 }
-                paranoid_free(tmp);
+                mr_free(tmp);
                 continue;
             }
@@ -560 +562 @@
             log_msg (4, "Error finding partition type for the partition %s", partitions[i]);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         /********
          * It's not swap, mounted, or LVM. See if it's used in a software raid device.
@@ -568 +570 @@
         log_msg(4, "  Running: %s", command);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
         if (!strlen(tmp)) {
             log_msg(4, "  Partition %s is not used in a non-LVM software raid device", partitions[i]);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
@@ -579 +581 @@
         log_msg (5, "  Running: %s", command);
         mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
         log_msg(4, "  Software raid device list: %s", mount_list);
         /* Loop through the software raid device list to see if we can find the partition */
@@ -586 +588 @@
             mr_asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
-            paranoid_free(tmp);
+            mr_free(tmp);
             mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
-            paranoid_free(command);
+            mr_free(command);
             if (!atoi(tmp)) {
                 log_msg (4,"  Didn't find partition %s in software raid device %s", partitions[i], token);
@@ -594 +596 @@
                 if ((DSFptr = find_device_in_list(token)) == NULL) {
                     log_msg (4, "Can't find device %s in mounted file systems list", token);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     mr_free(token);
                     return (1);
@@ -603 +605 @@
             mr_free(token);
         }
-        paranoid_free(tmp);
-    }
-    paranoid_free(partition_list);
-    paranoid_free(mount_list);
+        mr_free(tmp);
+    }
+    mr_free(partition_list);
+    mr_free(mount_list);
 
     /* Determine how much memory to allocate for included_dsf_list and excluded_dsf_list */
@@ -753 +755 @@
 
     if (flag_set['I']) {
-        if (bkpinfo->include_paths[0] == '-') {
+        if (bkpinfo->include_paths && bkpinfo->include_paths[0] == '-') {
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
-        }
-        if (!strcmp(bkpinfo->include_paths, "/")) {
-            log_msg(2, "'/' is pleonastic.");
         }
 
@@ -783 +782 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         while ((token = mr_strtok(flag_val['I'], token_chars, &lastpos)) != NULL) {
             switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
@@ -798 +797 @@
                 log_to_screen("  %s\n", mounted_on_dsf);
                 mr_asprintf(&p, "/");
+                mr_free(bkpinfo->include_paths);
                 bkpinfo->include_paths = p;
                 if (strlen(not_mounted_on_dsf)) {
@@ -803 +803 @@
                     log_to_screen("Not archiving the following file systems:\n");
                     log_to_screen("  %s\n", not_mounted_on_dsf);
-                    mr_strcat(bkpinfo->exclude_paths, "%s ", not_mounted_on_dsf);
+                    mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf);
                 }
                 break;
@@ -837 +837 @@
         bkpinfo->make_filelist = FALSE;
         mr_asprintf(&p, "%s", flag_val['J']);
+        mr_free(bkpinfo->include_paths);
         bkpinfo->include_paths = p;
     }
@@ -1089 +1090 @@
 
     if (flag_set['E']) {
-        if (bkpinfo->exclude_paths[0] == '-') {
+        if (bkpinfo->exclude_paths && bkpinfo->exclude_paths[0] == '-') {
             retval++;
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        mr_strcat(bkpinfo->exclude_paths, " ");
         mr_asprintf(&tmp1, "%s", flag_val['E']);
 
@@ -1136 +1136 @@
                     log_to_screen("  %s\n", mounted_on_dsf);
                     log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
-                    mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
-                    }
+                    mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
                 }
                 break;
@@ -1146 +1145 @@
             /* A device special file was not passed in. Process it as a path. */
             case -1:
-                mr_strcat(bkpinfo->exclude_paths, "%s ", token);
+                mr_strcat(bkpinfo->exclude_paths, " %s ", token);
                 break;
             }
@@ -1164 +1163 @@
     {
         mr_asprintf(&psz, "%s", list_of_NFS_mounts_only());
-        mr_strcat(bkpinfo->exclude_paths, "%s ", psz);
+        mr_strcat(bkpinfo->exclude_paths, " %s ", psz);
         mr_free(psz);
 
@@ -1300 +1299 @@
 
     if (flag_set['S']) {
-        sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
-                random() % 32768);
+        mr_asprintf(&tmp1, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768);
+        mr_free(bkpinfo->scratchdir);
+        bkpinfo->scratchdir = tmp1;
     }
 
@@ -1376 +1376 @@
         finish(0);
     }
+    mr_free(tmp);
 
     if ((flag_set['L']) && (! bkpinfo->restore_data)) {
@@ -1466 +1467 @@
 /* and finally... */
 
-    paranoid_free(tmp);
     return (retval);
 }
@@ -1515 +1515 @@
                 mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -1531 +1531 @@
                             mr_asprintf(&tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             log_to_screen(tmp);
-                            paranoid_free(tmp);
+                            mr_free(tmp);
                             bad_switches = TRUE;
                         }
@@ -1544 +1544 @@
         mr_asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     return (bad_switches);
@@ -1607 +1607 @@
     mr_strcat(tmp, " signal received from OS");
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_to_screen(tmp2);
-    paranoid_free(tmp2);
+    mr_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);

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

@@ -1979 +1979 @@
             finish(1);
         }
-        strcpy(bkpinfo->scratchdir, p);
-        mr_free(p);
+        mr_free(bkpinfo->scratchdir);
+        bkpinfo->scratchdir = p;
 
 // Interactive mode:
@@ -2156 +2156 @@
     if (tmp[0] != '/') {
         mr_asprintf(&sz, "%s", tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         mr_asprintf(&tmp, "/%s", sz);
         mr_free(sz);
@@ -2166 +2166 @@
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
-    sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp,
-            (int) (random() % 32768));
+    mr_asprintf(&sz, "%s/mondo.scratch.%d", tmp, (int) (random() % 32768));
+    mr_free(bkpinfo->scratchdir);
+    bkpinfo->scratchdir = sz;
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
     mr_asprintf(&command, "rm -Rf %s/tmp.mondo.* %s/mondo.scratch.*", tmp, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     paranoid_system(command);

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

@@ -1296 +1296 @@
 
     assert(bkpinfo != NULL);
-    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir,
-           bkpinfo->scratchdir);
+    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
@@ -1308 +1307 @@
     if (bkpinfo->make_filelist) {
         res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, bkpinfo->include_paths,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential, NULL);
+            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
         res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, NULL,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential,
-                               bkpinfo->include_paths);
+            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 
@@ -1382 +1374 @@
         malloc_string(find_skeleton_marker);
         mr_asprintf(&find_excludes, " ");
-        while((token = mr_strtok (sth, delims, &lastpos))) {
-          mr_asprintf(&strtmp,"%s", find_excludes);
-          paranoid_free(find_excludes);
-          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
-          paranoid_free(strtmp);
-          mr_free(token);
+        if (sth != NULL) {
+            while((token = mr_strtok(sth, delims, &lastpos))) {
+                mr_strcat(find_excludes," -path %s -prune -o", token);
+            }
         }
 #if linux
@@ -1396 +1386 @@
         mr_asprintf(&strtmp, "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);
+        mr_free(find_excludes);
+
         log_msg(5, "find command = %s", strtmp);
         (void)system(strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
+
         mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
-        g_skeleton_entries =
-            1 + atol(call_program_and_get_last_line_of_output(tmp));
-        paranoid_free(tmp);
+        g_skeleton_entries = 1 + atol(call_program_and_get_last_line_of_output(tmp));
+        mr_free(tmp);
+
         sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
@@ -1415 +1407 @@
                 "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_skeleton_filelist);
-//    log_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-//        log_msg(5, "Found %s", dir);
-//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
             sprintf(find_skeleton_marker, "mv -f %s.new %s",
                     g_skeleton_filelist, g_skeleton_filelist);
-//        log_msg(6, "fsm = %s", find_skeleton_marker);
             run_program_and_log_output(find_skeleton_marker, 8);
             time(&this_time);
@@ -1570 +1558 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist, *exclude_paths, *tmp;
+    char *sz_filelist;
+    char *exclude_paths = NULL;
+    char *tmp;
     int i;
     FILE *fout;
@@ -1581 +1571 @@
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
     mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
@@ -1637 +1624 @@
         mr_free(command);
     } else {
-        log_msg(2, "include_paths = '%s'", include_paths);
+        if (include_paths) {
+            log_msg(2, "include_paths = '%s'", include_paths);
+        }
         log_msg(1, "Calculating filelist");
         mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
@@ -1649 +1638 @@
             log_msg(2, "Found windows files: %s",tmp2);
         }
-        paranoid_free(tmp1);
-
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media /tmp \
-/proc /sys " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
-        paranoid_free(tmp2);
+        mr_free(tmp1);
+
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2,
-                "Generating skeleton filelist so that we can track our progress");
+        log_msg(2, "Generating skeleton filelist so that we can track our progress");
         sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_skeleton_filelist);
@@ -1667 +1653 @@
         }
         i = 0;
-        if (strlen(include_paths) == 0) {
+        if ((!include_paths) || (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
@@ -1685 +1671 @@
             }
         }
+        mr_free(exclude_paths);
         paranoid_fclose(fout);
     }
@@ -1702 +1689 @@
     paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    paranoid_free(exclude_paths);
     paranoid_free(tmp);
     paranoid_free(g_skeleton_filelist);

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

@@ -448 +448 @@
         mr_free(tmp);
     }
-    make_hole_for_dir(bkpinfo->scratchdir);
+    if (bkpinfo->scratchdir) {
+        make_hole_for_dir(bkpinfo->scratchdir);
+        chmod(bkpinfo->scratchdir, 0700);
+    } else {
+        fatal_error("Scratchdir set to NULL !");
+    }
     if (bkpinfo->backup_media_type == iso)
         make_hole_for_dir(bkpinfo->isodir);
@@ -680 +685 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
-        log_it("tmpdir or scratchdir are blank/missing");
+    if (strlen(bkpinfo->tmpdir) < 2) {
+        log_it("tmpdir is blank/missing");
         retval++;
     }
@@ -688 +693 @@
         bkpinfo->include_paths = p;
     }
-    chmod(bkpinfo->scratchdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);

branches/2.2.10/mondo/src/common/mondostructures.h

@@ -480 +480 @@
    * As such, it needs to be at least as large as the largest CD/DVD/ISO.
    */
-    char scratchdir[MAX_STR_LEN / 4];
+    char *scratchdir;
 
   /**
@@ -515 +515 @@
    * If you do nothing, "/" will be used.
    */
-    char include_paths[MAX_STR_LEN*4];
+    char *include_paths;
 
   /**
@@ -522 +522 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN*4];
+    char *exclude_paths;
 
   /**

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

@@ -294 +294 @@
      fatal_error(char *error_string) {
         /*@ buffers ***************************************************** */
-        char fatalstr[MAX_NEWT_COMMENT_LEN] =
-            "-------FATAL ERROR---------";
-        char *tmp;
-        char *command;
+        char *command = NULL;
         static bool already_exiting = FALSE;
 
         /*@ end vars **************************************************** */
 
-        malloc_string(command);
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -311 +306 @@
             log_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
-            paranoid_free(tmp);
             finish(1);
         }
@@ -319 +313 @@
                 log_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
-                paranoid_free(tmp);
                 finish(1);
             }
@@ -327 +320 @@
         if (already_exiting) {
             log_msg(3, "...I'm already exiting. Give me time, Julian!");
-            paranoid_free(tmp);
             finish(1);
         }
@@ -338 +330 @@
         kill_anything_like_this("ntfsclone");
         sync();
-        /*
-        sprintf(tmp, "umount %s", g_tmpfs_mountpt);
-        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
-            log_msg(2, "Waiting for child processes to terminate");
-            sleep(1);
-            run_program_and_log_output(tmp, 5);
-        }
-        */
 
         chdir("/");
         if (g_selfmounted_isodir) {
-            sprintf(command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            sprintf(command, "rmdir %s", g_selfmounted_isodir);
+            mr_free(command);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
+            mr_free(command);
         }
 
         if (!g_text_mode) {
-            log_msg(0, fatalstr);
+            log_msg(0, "-------FATAL ERROR---------");
             log_msg(0, error_string);
             newtFinished();
@@ -362 +348 @@
 
         printf("---FATALERROR--- %s\n", error_string);
-        printf
-                ("If you require technical support, please contact the mailing list.\n");
+        printf("If you require technical support, please contact the mailing list.\n");
         printf("See http://www.mondorescue.org for details.\n");
-        printf
-                ("The list's members can help you, if you attach that file to your e-mail.\n");
+        printf("The list's members can help you, if you attach that file to your e-mail.\n");
         printf("Log file: %s\n", MONDO_LOGFILE);
         printf("Mondo has aborted.\n");
@@ -372 +356 @@
             log_msg(3, "FYI - g_main_pid is blank");
         }
-        paranoid_free(tmp);
-        paranoid_free(command);
         finish(254);
     }
@@ -405 +387 @@
             mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
+
             mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
         }
         if (!g_text_mode) {
@@ -443 +426 @@
         mr_free(bkpinfo->exclude_paths);
         mr_free(bkpinfo->include_paths);
+        mr_free(bkpinfo->scratchdir);
 
         /* Then free the structure */
-        paranoid_free(bkpinfo);
+        mr_free(bkpinfo);
         free_libmondo_global_strings();
         free_newt_stuff();
@@ -947 +931 @@
         }
 
-        err_log_lines =
-            (char **) malloc(sizeof(char *) * g_noof_log_lines);
-        if (!err_log_lines) {
-            fatal_error("Out of memory");
-        }
+        err_log_lines = (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
 
         for (i = 0; i < g_noof_log_lines; i++) {
-            err_log_lines[i] = (char *) malloc(MAX_NEWT_COMMENT_LEN);
-            if (!err_log_lines[i]) {
-                fatal_error("Out of memory");
-            }
+            err_log_lines[i] = (char *) mr_malloc(MAX_NEWT_COMMENT_LEN);
         }
 
@@ -1055 +1032 @@
         }
         if (!g_text_mode) {
-//      log_it("refreshing");
             newtRefresh();
         }
@@ -1080 +1056 @@
     void
      update_progress_form(char *blurb3) {
-        /*  log_it("update_progress_form --- called"); */
         if (g_current_progress == -999) {
-            /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
             return;
         }
@@ -1194 +1168 @@
         }
     }
-
-
-
-
-
-
-
-
-
-
-
-
 
 
@@ -1280 +1242 @@
         }
         newtPushHelpLine(title_sz);
-        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
         b1 = newtButton(1, 1, "CD-R disks ");

branches/2.2.10/mondo/src/include/mr_mem.h

@@ -20 +20 @@
 #define mr_allocstr(x,y) mr_allocstr_int(x,y,__LINE__,__FILE__)
 #define mr_asprintf(x,y,args...) mr_asprintf_int(x,__LINE__,__FILE__,y,## args)
-#define mr_getline(x,z) mr_getline_int(x,z,__LINE__,__FILE__)
+#define mr_getline(x,y) mr_getline_int(x,y,__LINE__,__FILE__)
 #define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
 #define mr_setenv(x,y) mr_setenv_int(x,y,__LINE__,__FILE__)

branches/2.2.10/mondo/src/lib/mr_err.c

@@ -16 +16 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "mr_msg.h"
 
 /* Pointer to the right cleanup function provided by each main */
-extern void (*mr_cleanup)(void);
+extern void (*mr_cleanup)(int);
 
 /*
@@ -26 +27 @@
 
     if (mr_cleanup != NULL) {
-        mr_cleanup();
+        mr_cleanup(errorcode);
     }
     if (message != NULL) {
         fprintf(stderr,"%s\n",message);
     }
+    mr_msg_close();
     exit(errorcode);
 }

branches/2.2.10/mondo/src/lib/mr_mem.c

@@ -57 +57 @@
     
     ssize_t ret;
-    ssize_t *n;
+    ssize_t n = 0;
 
-    ret = getline(lineptr,n,fd);
+    ret = getline(lineptr,&n,fd);
     if ((ret == -1) && (! feof(fd))) {
         mr_msg_int(1,line,file,"Unable to alloc memory in mr_getline\nExiting...");

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -54 +54 @@
 struct s_bkpinfo *bkpinfo;
 
-/* No cleanup for the moment */
-void (*mr_cleanup)(void) = NULL;
+/*  Make cleanup the finish function */
+void (*mr_cleanup)(int) = finish;
 
 /* To be coded */

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -21 +21 @@
 extern void twenty_seconds_til_yikes(void);
 
-/* We don't have a cleanup function yet */
-void (*mr_cleanup)(void) = NULL;
+/* Let mr_cleanup pojnt to finish for the moment */
+void (*mr_cleanup)(int) = finish;
 
 /* Reference to global bkpinfo */

branches/2.2.10/mondo/test/test-mountlist.c

@@ -44 +44 @@
 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived, char direction);
 /* We don't have a cleanup function yet */
-void (*mr_cleanup)(void) = NULL;
+void (*mr_cleanup)(int) = NULL;
 
 void main() {

branches/2.2.10/mondo/test/test-truncname.c

@@ -43 +43 @@
 extern char *truncate_to_drive_name(char *);
 /* We don't have a cleanup function yet */
-void (*mr_cleanup)(void) = NULL;
+void (*mr_cleanup)(int) = NULL;
 void free_MR_global_filenames() {
 }