Changeset 783 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-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/mondorestore/mondo-rstr-tools.c (modified) (21 diffs)

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -5 +5 @@
 #include <unistd.h>
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -39 +39 @@
 
 extern t_bkptype g_backup_media_type;
+extern char *g_backup_media_string;
 
 extern int g_partition_table_locked_up;
@@ -290 +291 @@
     assert(bkpinfo != NULL);
     g_ISO_restore_mode = TRUE;
+
+    paranoid_free(g_isodir_device);
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
     if (bkpinfo->disaster_recovery) {
 /* Patch Conor Daly 26-june-2004 
  * Don't let this clobber an existing bkpinfo->isodir */
-        if (!bkpinfo->isodir[0]) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        if (!bkpinfo->isodir) {
+            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
         }
 /* End patch */
@@ -344 +347 @@
     i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
     asprintf(&tmp, "%s #%d has been mounted via loopback mount",
-            media_descriptor_string(bkpinfo->backup_media_type), i);
+            bkpinfo->backup_media_string, i);
     log_msg(1, tmp);
     paranoid_free(tmp);
@@ -497 +500 @@
 {
     char *mount_cmd = NULL;
-    char *tmp = NULL;
     int i, res;
 #ifdef __FreeBSD__
@@ -519 +521 @@
         log_msg(2, "Mounting for NFS thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
+        if ((!bkpinfo->isodir || !strcmp(bkpinfo->isodir, "/"))
             && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
@@ -663 +665 @@
         asprintf(&p2, ",user_xattr");
     } else {
-        asprintf(&p2, "");
+        asprintf(&p2, "%s", "");
     }
     paranoid_free(tmp);
@@ -671 +673 @@
         asprintf(&p3, ",acl");
     } else {
-        asprintf(&p3, "");
+        asprintf(&p3, "%s", "");
     }
     paranoid_free(tmp);
@@ -789 +791 @@
     char *value = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -836 +839 @@
 
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_free(bkpinfo->prefix);
-                bkpinfo->prefix = value;
+                paranoid_alloc(bkpinfo->prefix,value);
             } else {
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
@@ -845 +847 @@
             paranoid_free(value);
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_free(bkpinfo->prefix);
-                bkpinfo->prefix = value;
+                paranoid_alloc(bkpinfo->prefix,value);
             } else {
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
@@ -869 +870 @@
         } else if (bkpinfo->backup_media_type == tape
                    || bkpinfo->backup_media_type == udev) {
+            paranoid_free(bkpinfo->media_device);
             if (read_cfg_var(cfg_file, "media-dev", bkpinfo->media_device)) {
                 fatal_error("Cannot get tape device name from cfg file");
@@ -964 +966 @@
                     "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
         } else {
+            paranoid_free(bkpinfo->nfs_mount);
+            paranoid_free(bkpinfo->nfs_remote_dir);
             read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
                          bkpinfo->nfs_mount);
@@ -976 +980 @@
          * isodir in disaster recovery mode
          */
-        old_isodir = bkpinfo->isodir;
+        paranoid_alloc(old_isodir,bkpinfo->isodir);
         read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
         read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
         if (iso_mnt && iso_path) {
+            paranoid_free(bkpinfo->isodir);
             asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-        } else {
-            bkpinfo->isodir = old_isodir;
         }
         paranoid_free(iso_mnt);
@@ -992 +995 @@
                     ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
                      old_isodir, bkpinfo->isodir);
-                if (bkpinfo->isodir != old_isodir) {
-                    paranoid_free(old_isodir);
-                }
-            } else {
-                paranoid_free(old_isodir);
-            }
-        }
-
+            }
+        }
+        paranoid_free(old_isodir);
+
+        paranoid_free(g_isodir_device);
         read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
         log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
@@ -1029 +1029 @@
                     paranoid_free(iso_mnt);
                     paranoid_free(iso_path);
-                    asprintf(&iso_mnt, "");
-                    asprintf(&iso_path, "");
+                    asprintf(&iso_mnt, "%s", "");
+                    asprintf(&iso_path, "%s", "");
 
                     if (mount_cdrom(bkpinfo)) {
@@ -1069 +1069 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (0);
 }
@@ -1823 +1825 @@
     assert(bkpinfo != NULL);
 
-    malloc_string(g_tmpfs_mountpt);
-
     asprintf(&g_biggielist_txt, "%s/%s",bkpinfo->tmpdir , BIGGIELIST_TXT_STUB);
     asprintf(&g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
@@ -1830 +1830 @@
     asprintf(&g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
             bkpinfo->tmpdir);
+    paranoid_free(g_mondo_cfg_file);
+    paranoid_free(g_mountlist_fname);
     if (bkpinfo->disaster_recovery) {
         asprintf(&g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
@@ -2110 +2112 @@
 {
     int retval = 0;
-    char *device = NULL;
     char *command = NULL;
     char *cfg_file = NULL;
@@ -2364 +2365 @@
 
     g_backup_media_type = bkpinfo->backup_media_type;
+    bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
+    g_backup_media_string = bkpinfo->backup_media_string;
     return (retval);
 }