Changeset 783 in MondoRescue for trunk/mondo/mondo/common/libmondo-tools.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/common/libmondo-tools.c (modified) (19 diffs)

trunk/mondo/mondo/common/libmondo-tools.c

@@ -74 +74 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern bool am_I_in_disaster_recovery_mode(void);
@@ -281 +282 @@
 {
     assert(raidrec != NULL);
-    raidrec->raid_device[0] = '\0';
+    raidrec->raid_device = NULL;
     raidrec->raid_level = -9;
     raidrec->persistent_superblock = 1;
@@ -356 +357 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    char call_before_iso_user[MAX_STR_LEN] = "\0";
+    char *call_before_iso_user = NULL;
     int rdsiz_MB;
     char *iso_path = NULL;
@@ -415 +416 @@
     if (avm / 1024 > rdsiz_MB * 3) {
         if (run_program_and_log_output(command, 5)) {
-            g_tmpfs_mountpt[0] = '\0';
+            paranoid_free(g_tmpfs_mountpt);
             log_it("Failed to mount tmpfs");
         } else {
@@ -421 +422 @@
         }
     } else {
-        g_tmpfs_mountpt[0] = '\0';
+        paranoid_free(g_tmpfs_mountpt);
         log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
     }
@@ -427 +428 @@
 
     if (bkpinfo->use_lzo) {
-        strcpy(bkpinfo->zip_exe, "lzop");
-        strcpy(bkpinfo->zip_suffix, "lzo");
+        paranoid_alloc(bkpinfo->zip_exe, "lzop");
+        paranoid_alloc(bkpinfo->zip_suffix, "lzo");
     } else if (bkpinfo->compression_level != 0) {
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
+        paranoid_alloc(bkpinfo->zip_exe, "bzip2");
+        paranoid_alloc(bkpinfo->zip_suffix, "bz2");
     } else {
-        bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+        bkpinfo->zip_exe = NULL;
+        bkpinfo->zip_suffix = NULL;
     }
 
@@ -470 +472 @@
             // -m isn't supported by growisofs, BTW...
         } else {
-            sprintf(bkpinfo->call_make_iso,
+            asprintf(&bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
                     mondo_mkisofs_sz, "", bkpinfo->media_device);
@@ -518 +520 @@
 
         if (bkpinfo->nonbootable_backup) {
-            asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", mrconf->mondo_iso_creation_cmd);
+            asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", bkpinfo->mr_conf->mondo_iso_creation_cmd);
         } else if
 #ifdef __FreeBSD__
@@ -539 +541 @@
         }
         if (bkpinfo->manual_cd_tray) {
-            if (bkpinfo->call_before_iso[0] == '\0') {
-            sprintf(bkpinfo->call_before_iso,
+            if (bkpinfo->call_before_iso == NULL) {
+                asprintf(&bkpinfo->call_before_iso,
                         "%s -o %s/temporary.iso . 2>> _ERR_",
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
-                } else {
-                strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
-                sprintf (bkpinfo->call_before_iso,
+            } else {
+                asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
+                asprintf(&bkpinfo->call_before_iso,
                                     "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
                         mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
+                paranoid_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            sprintf(bkpinfo->call_make_iso,
+            asprintf(&bkpinfo->call_make_iso,
                     "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
                     cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
@@ -556 +559 @@
                     bkpinfo->cdrw_speed, bkpinfo->tmpdir);
         } else {
-            sprintf(bkpinfo->call_make_iso,
+            asprintf(&bkpinfo->call_make_iso,
                     "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
                     mondo_mkisofs_sz, cdr_exe,
@@ -641 +644 @@
                                                           h_addr)),
                          strchr(bkpinfo->nfs_mount, ':'));
-                strcpy(bkpinfo->nfs_mount, ip_address);
+                paranoid_alloc(bkpinfo->nfs_mount, ip_address);
                 paranoid_free(ip_address);
             }
@@ -663 +666 @@
         retval++;
     }
-    if (bkpinfo->include_paths[0] == '\0') {
+    if (bkpinfo->include_paths == NULL) {
         //      fatal_error ("Why no backup path?");
-        strcpy(bkpinfo->include_paths, "/");
+        asprintf(&bkpinfo->include_paths, "/");
     }
     chmod(bkpinfo->scratchdir, 0700);
     chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
+    paranoid_alloc(g_backup_media_string,bkpinfo->backup_media_string);
     return (retval);
 }
@@ -712 +716 @@
     g_current_media_number = 1;
     bkpinfo->postnuke_tarball = NULL;
-    bkpinfo->nfs_mount = NULL;
+    paranoid_free(bkpinfo->nfs_mount);
     return (res);
 }
@@ -748 +752 @@
     paranoid_free(bkpinfo->restore_path);
     bkpinfo->use_lzo = FALSE;
-    paranoid_free(bkpinfo->do_not_compress_these);
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -767 +770 @@
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
+    paranoid_free(bkpinfo->backup_media_string);
     paranoid_alloc(bkpinfo->include_paths, "/");
     paranoid_free(bkpinfo->exclude_paths);
@@ -1043 +1047 @@
         value = NULL;
         return (1);
-    } else if (strstr(value, "/dev/") && strstr(value, "t0")
+    /* } BERLIOS: Useless: 
+         else if (strstr(value, "/dev/") && strstr(value, "t0")
                && !strcmp(label, "media-dev")) {
         log_msg(2, "FYI, I shan't read new value for %s - already got %s",
                 label, value);
         return (0);
-    } else {
+    */ } else {
         asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
                 label, config_file);
@@ -1102 +1107 @@
 
     log_msg(1, "Started sub");
-    log_msg(4, "About to set g_boot_mountpt to \"\"");
-    asprintf(&g_boot_mountpt, "");
-    log_msg(4, "Done. Great. Seeting command to something");
+    log_msg(4, "Setting command to something");
     asprintf(&command,
              "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
@@ -1136 +1139 @@
                 asprintf(&tmp1, "mount %s", g_boot_mountpt);
                 if (run_program_and_log_output(tmp1, 5)) {
+                    /* BERLIOS: Useless ???
                     paranoid_free(g_boot_mountpt);
                     asprintf(&g_boot_mountpt, " ");
+                    */
                     log_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
@@ -1166 +1171 @@
 
     log_msg(3, "starting");
-    if (g_boot_mountpt[0]) {
+    if (g_boot_mountpt != NULL) {
         asprintf(&tmp, "umount %s", g_boot_mountpt);
         if (run_program_and_log_output(tmp, 5)) {