Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

Aug 18, 2009, 3:19:15 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3336@localhost: bruno | 2009-08-11 16:32:36 +0200

• bkpinfo->media_device, bkpinfo->nfs_remote_dir, and bkpinfo->nfs_mount are now dynamically allocated
• new interfaces for find_cdrom_device(), find_tape_device_and_size(), find_dvd_device(), find_cdrw_device(), set_dev_to_this_if_rx_OK() and read_cfg_var() which allocate the string now returned
• Better differentiation between ISO and NFS iso file names construction

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (12 diffs)

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

@@ -419 +419 @@
     char *p = NULL;
     char call_before_iso_user[MAX_STR_LEN] = "\0";
-    /*
-    long avm = 0;
-    int rdsiz_MB;
-    */
     char *iso_dev = NULL;
     char *iso_mnt = NULL;
@@ -449 +445 @@
     if (bkpinfo->backup_media_type == tape) {
         log_msg(1, "Bar");
+        if (bkpinfo->media_device == NULL) {
+            return(1);
+        }
         mr_asprintf(tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
@@ -526 +525 @@
             // -m isn't supported by growisofs, BTW...
         } else {
+            if (bkpinfo->media_device == NULL) {
+                return(1);
+            }
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
@@ -594 +596 @@
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
+            if (bkpinfo->media_device == NULL) {
+                return(1);
+            }
             sprintf(bkpinfo->call_make_iso,
                     "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
@@ -667 +672 @@
 
     if (bkpinfo->backup_media_type == nfs) {
-        strcpy(hostname, bkpinfo->nfs_mount);
+        if (bkpinfo->nfs_mount) {
+            strcpy(hostname, bkpinfo->nfs_mount);
+        } else {
+            log_it("nfs_mount is NULL");
+            retval++;
+            strcpy(hostname, "");
+        }
         colon = strchr(hostname, ':');
         if (!colon) {
@@ -678 +689 @@
             hent = gethostbyname(hostname);
             if (!hent) {
-                log_it("Can't resolve NFS mount (%s): %s", hostname,
-                       hstrerror(h_errno));
+                log_it("Can't resolve NFS mount (%s): %s", hostname, hstrerror(h_errno));
                 retval++;
             } else {
                 mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
                 mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
-                strcpy(bkpinfo->nfs_mount, ip_address);
-                paranoid_free(ip_address);
+                mr_free(bkpinfo->nfs_mount);
+                bkpinfo->nfs_mount = ip_address;
             }
         }
@@ -746 +756 @@
     }
     g_current_media_number = 1;
-    bkpinfo->postnuke_tarball[0] = bkpinfo->nfs_mount[0] = '\0';
+    bkpinfo->postnuke_tarball[0] = '\0';
     return (res);
 }
@@ -787 +797 @@
 void mr_free_bkpinfo() {
 
+    mr_free(bkpinfo->media_device);
+    mr_free(bkpinfo->isodir);
+    mr_free(bkpinfo->prefix);
     mr_free(bkpinfo->scratchdir);
     mr_free(bkpinfo->tmpdir);
     mr_free(bkpinfo->include_paths);
     mr_free(bkpinfo->exclude_paths);
+    mr_free(bkpinfo->nfs_mount);
+    mr_free(bkpinfo->nfs_remote_dir);
     mr_free(bkpinfo->nfs_user);
 
@@ -804 +819 @@
 {
     int i;
-    char *p = NULL;
-
     log_msg(1, "Hi");
 
     /* Initialized in same order as in the structure declaration to detect errors more easily */
-    bkpinfo->media_device[0] = '\0';
+    bkpinfo->media_device = NULL;
     for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
         bkpinfo->media_size[i] = -1;
@@ -846 +859 @@
     bkpinfo->call_after_iso[0] = '\0';
     bkpinfo->kernel_path[0] = '\0';
-    bkpinfo->nfs_mount[0] = '\0';
-    bkpinfo->nfs_remote_dir[0] = '\0';
+    bkpinfo->nfs_mount = NULL;
+    bkpinfo->nfs_remote_dir = NULL;
     bkpinfo->nfs_user = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
@@ -1072 +1085 @@
  * @return 0 for success, 1 for failure.
  */
-int read_cfg_var(char *config_file, char *label, char *value)
+char *read_cfg_var(char *config_file, char *label)
 {
     /*@ buffer ****************************************************** */
     char *command = NULL;
+    char *value = NULL;
 
     /*@ end vars *************************************************** */
@@ -1083 +1097 @@
     if (!does_file_exist(config_file)) {
         log_to_screen("(read_cfg_var) Cannot find %s config file", config_file);
-        value[0] = '\0';
-        return (1);
+        return (NULL);
+        /* BERLIOS: not sure the sage of this one ?
     } else if ((value != NULL) && (strstr(value, "/dev/") && strstr(value, "t0") && !strcmp(label, "media-dev"))) {
         log_msg(2, "FYI, I can't read new value for %s - already got %s", label, value);
         return (0);
+        */
     } else {
         mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
-        strcpy(value, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(value, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
         if (strlen(value) == 0) {
-            return (1);
+            return (NULL);
         } else {
-            return (0);
+            return (value);
         }
     }