Changeset 1628 in MondoRescue

Timestamp:

Sep 9, 2007, 3:14:36 AM (17 years ago)

Author:

Bruno Cornec

Message:

prefix is also now read from conf file

Location:

branches/stable/mondo/src

Files:

• common/libmondo-tools.c (modified) (1 diff)
• common/mondostructures.h (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore/mondorestore.c (modified) (2 diffs)

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

@@ -721 +721 @@
         strcpy(bkpinfo->isodir, "/var/cache/mondo/iso");
     }
-    strcpy(bkpinfo->prefix, STD_PREFIX);
+    mr_asprintf(&tmp,mr_conf->prefix);
+    bkpinfo->prefix = tmp;
 
     bkpinfo->scratchdir[0] = '\0';

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

@@ -443 +443 @@
    * If backup_media_type is anything else, this is ignored.
    */
-    char prefix[MAX_STR_LEN / 4];
+    char *prefix;
 
   /**

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -614 +614 @@
 
     if (flag_set['p']) {
-        strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
+        mr_allocstr(bkpinfo->prefix, flag_val['p']);
     }
 

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

@@ -800 +800 @@
             }
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                    strcpy(bkpinfo->prefix,value);
+                mr_allocstr(bkpinfo->prefix,value);
             } else {
-                    strcpy(bkpinfo->prefix,STD_PREFIX);
+                mr_allocstr(bkpinfo->prefix,STD_PREFIX);
             }
         } else if (!strcmp(value, "nfs")) {
             bkpinfo->backup_media_type = nfs;
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                    strcpy(bkpinfo->prefix,value);
+                mr_allocstr(bkpinfo->prefix,value);
             } else {
-                    strcpy(bkpinfo->prefix,STD_PREFIX);
+                mr_allocstr(bkpinfo->prefix,STD_PREFIX);
             }
             if (strstr(call_program_and_get_last_line_of_output
@@ -819 +819 @@
                     fatal_error("no imgname variable in environment");
                 }
-                strcpy(bkpinfo->prefix,envtmp1);
+                mr_allocstr(bkpinfo->prefix,envtmp1);
             }
 

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -438 +438 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
     iamhere("Done loading config file; resizing ML");
-    strcpy(tmp, bkpinfo->prefix);
     if (popup_and_get_string
-        ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) {
-        strcpy(bkpinfo->prefix, tmp);
+        ("Prefix", "Prefix of your ISO images ?", bkpinfo->prefix, MAX_STR_LEN / 4)) {
         mr_msg(1, "Prefix set to %s",bkpinfo->prefix);
     }
@@ -3047 +3045 @@
 
     if (argc == 3 && strcmp(argv[1], "-p") == 0) {
-        strcpy(bkpinfo->prefix,argv[2]);
+        mr_allocstr(bkpinfo->prefix,argv[2]);
         mr_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }