Changeset 2322 in MondoRescue

Timestamp:

Aug 18, 2009, 2:37:58 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3333@localhost: bruno | 2009-08-08 01:58:31 +0200

• bkpinfo->prefix is now dynamically assigned
• Fix newt mondoarchive

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (5 diffs)
• common/libmondo-string.c (modified) (9 diffs)
• common/libmondo-tools.c (modified) (2 diffs)
• common/mondostructures.h (modified) (1 diff)
• lib/mr_mem.c (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (5 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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

@@ -1226 +1226 @@
 
     if (flag_set['p']) {
-        strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
+        mr_free(bkpinfo->prefix);
+        mr_asprintf(&tmp1, "%s", flag_val['p']);
+        bkpinfo->prefix = tmp1;
         log_msg(1,"Prefix forced to %s",bkpinfo->prefix);
     }

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

@@ -19 +19 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
+
+extern void mr_strip_spaces(char *);
 
 #include <sys/types.h>
@@ -1803 +1805 @@
             finish(1);
         }
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = p;
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
-        strcpy(bkpinfo->prefix, p);
-        mr_free(p);
 
         log_msg(3, "Just set nfs_remote_dir to %s", bkpinfo->nfs_remote_dir);
@@ -1847 +1849 @@
             finish(1);
         }
-        strcpy(bkpinfo->prefix, p);
-        mr_free(p);
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = p;
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
+
     default:
         fatal_error
@@ -2017 +2020 @@
     log_it("media device = %s", bkpinfo->media_device);
     log_it("media size = %ld", bkpinfo->media_size[1]);
-    log_it("media type = %s",
-           bkptype_to_string(bkpinfo->backup_media_type));
+    log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
@@ -2026 +2028 @@
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
     log_it("image_devs = '%s'", bkpinfo->image_devs);
-    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
-           bkpinfo->boot_loader);
+    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
     if (bkpinfo->media_size[0] < 0) {
         if (archiving_to_media) {

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

@@ -203 +203 @@
     int i;
     char *tmp;
+    char *tmp1 = NULL;
     char ch;
 
@@ -224 +225 @@
     tmp[i] = '\0';
     outval = atol(tmp);
+    paranoid_free(tmp);
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;
@@ -239 +241 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        sprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')",
-                incoming, ch);
-        fatal_error(tmp);
-    }
-    paranoid_free(tmp);
+        mr_asprintf(&tmp1, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
+        fatal_error(tmp1);
+    }
     return (outval);
 }
@@ -549 +549 @@
     /*@ buffers **************************************************** */
     static char output[MAX_STR_LEN];
-    static char suffix[MAX_STR_LEN];
+    char *suffix = NULL;
 
     /*@ end vars *************************************************** */
@@ -555 +555 @@
     assert_string_is_neither_NULL_nor_zerolength(path);
     if (s[0] != '\0') {
-        sprintf(suffix, ".%s", s);
+        mr_asprintf(&suffix, ".%s", s);
     } else {
-        suffix[0] = '\0';
-    }
-    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno,
-            suffix);
+        mr_asprintf(&suffix, "");
+    }
+    sprintf(output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno, sliceno, suffix);
+    mr_free(suffix);
     return (output);
 }
@@ -925 +925 @@
 {
     int sev;
-    char *reason;
-    char *filename;
-
-    malloc_string(reason);
-    malloc_string(filename);
-    
+    char *reason = NULL;
+    char *filename = NULL;
+
     // out_reason might be null on purpose, so don't bomb if it is :) OK?
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        strcpy(filename, fn + strlen(MNT_RESTORING));
+        mr_asprintf(&filename, "%s", fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        sprintf(filename, "/%s", fn);
+        mr_asprintf(&filename, "/%s", fn);
     } else {
-        strcpy(filename, fn);
+        mr_asprintf(&filename, "%s", fn);
     }
 
     sev = 3;
-    sprintf(reason,
-            "Changed since backup. Consider running a differential backup in a day or two.");
+    mr_asprintf(&reason, "Changed since backup. Consider running a differential backup in a day or two.");
+
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        sprintf(reason,
-                "/var's contents will change regularly, inevitably.");
+        mr_free(reason);
+        mr_asprintf(&reason, "/var's contents will change regularly, inevitably.");
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        sprintf(reason,
-                "It's in your /home directory. Therefore, it is important.");
+        mr_free(reason);
+        mr_asprintf(&reason, "It's in your /home directory. Therefore, it is important.");
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        sprintf(reason,
-                "You may have installed/removed software during the backup.");
+        mr_free(reason);
+        mr_asprintf(&reason, "You may have installed/removed software during the backup.");
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        sprintf(reason,
-                "Do not edit config files while backing up your PC.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Do not edit config files while backing up your PC.");
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        sprintf(reason, "This file changes all the time. It's OK.");
+        mr_free(reason);
+        mr_asprintf(&reason, "This file changes all the time. It's OK.");
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        sprintf(reason, "Were you compiling/editing something in /root?");
+        mr_free(reason);
+        mr_asprintf(&reason, "Were you compiling/editing something in /root?");
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        sprintf(reason, "Temp or 'dot' files changed in /root.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Temp or 'dot' files changed in /root.");
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        sprintf(reason, "Did you add/remove software during backing?");
+        mr_free(reason);
+        mr_asprintf(&reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        sprintf(reason, "Did you add/remove software during backing?");
+        mr_free(reason);
+        mr_asprintf(&reason, "Did you add/remove software during backing?");
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        sprintf(reason,
-                "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+        mr_free(reason);
+        mr_asprintf(&reason, "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -994 +996 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        sprintf(reason,
-                "Log files change frequently as the computer runs. Fret not.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Log files change frequently as the computer runs. Fret not.");
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        sprintf(reason,
-                "Background processes or printers were active. This does not affect the integrity of your backup.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Background processes or printers were active. This does not affect the integrity of your backup.");
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        sprintf(reason, "Mail was sent/received during backup.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Mail was sent/received during backup.");
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        sprintf(reason,
-                "Backup copy of another file which was modified recently.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Backup copy of another file which was modified recently.");
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        sprintf(reason,
-                "Part of a cache of data. Caches change from time to time. Don't worry.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Part of a cache of data. Caches change from time to time. Don't worry.");
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -1021 +1024 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        sprintf(reason,
-                "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
+        mr_free(reason);
+        mr_asprintf(&reason, "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
     if (out_reason) {
         strcpy(out_reason, reason);
     }
-    paranoid_free(filename);
-    paranoid_free(reason);
+    mr_free(filename);
+    mr_free(reason);
     return (sev);
 }
@@ -1078 +1081 @@
     /*@ buffers ******************************************* */
     char *outstr = NULL;
-    char *pos_w_commas, *tmp;
+    char *pos_w_commas = NULL;
     char *mds = NULL;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
 
     if (bkpinfo->media_size[g_current_media_number] <= 0) {
-        malloc_string(pos_w_commas);
-        malloc_string(tmp);
-        sprintf(tmp, "%lld", g_tape_posK);
-        strcpy(pos_w_commas, commarize(tmp));
-        paranoid_free(tmp);
+        mr_asprintf(&tmp, "%lld", g_tape_posK);
+        mr_asprintf(&pos_w_commas, "%s", commarize(tmp));
+        mr_free(tmp);
         mr_asprintf(&outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
-        paranoid_free(pos_w_commas);
+        mr_free(pos_w_commas);
         return (outstr);
     }

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

@@ -804 +804 @@
 {
     int i;
+    char *p = NULL;
 
     log_msg(1, "Hi");
@@ -832 +833 @@
         strcpy(bkpinfo->isodir, MONDO_CACHE);
     }
-    strcpy(bkpinfo->prefix, STD_PREFIX);
+    mr_asprintf(&p, "%s", STD_PREFIX);
+    bkpinfo->prefix = p;
     bkpinfo->scratchdir = NULL;
     bkpinfo->tmpdir = NULL;

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

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

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

@@ -57 +57 @@
     
     ssize_t ret;
-    ssize_t n = 0;
+    size_t n = 0;
 
     ret = getline(lineptr,&n,fd);

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

@@ -32 +32 @@
 
 /***************** global vars, used only by main.c ******************/
-long diffs;
+long diffs = 0L;
 
 extern t_bkptype g_backup_media_type;
@@ -167 +167 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    int res, retval;
+    int res = 0;
+    int i = 0;
+    int retval = 0;
     char *say_at_end = NULL;
-
-/* Initialize variables */
-
-    res = 0;
-    retval = 0;
-    diffs = 0;
 
     printf("Initializing...\n");
@@ -191 +187 @@
     } else {
         g_text_mode = TRUE;
+        /* newt mode if -g specified on cli */
+        for (i = 0; i < argc; i++) {
+            if (!strcmp(argv[i],"-g")) {
+                g_text_mode = FALSE;
+            }
+        }
     }
     setup_newt_stuff();
@@ -235 +237 @@
     if (argc == 4 && !strcmp(argv[1], "getfattr")) {
         g_loglevel = 10;
-        g_text_mode = TRUE;
         if (!strstr(argv[2], "filelist")) {
             printf("Sorry - filelist goes first\n");
@@ -438 +439 @@
 
     if (!g_text_mode) {
-        popup_and_OK
-            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
+        popup_and_OK("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
         log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
     } else {

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

@@ -772 +772 @@
         }
     }
+    mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
+        mr_asprintf(&tmp1, "%s", value);
     } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
+        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+    }
+    bkpinfo->prefix = tmp1;
 } else if (!strcmp(value, "nfs")) {
     bkpinfo->backup_media_type = nfs;
     bkpinfo->please_dont_eject = TRUE;
+    mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
+        mr_asprintf(&tmp1, "%s", value);
     } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
-    if (strstr(call_program_and_get_last_line_of_output
-       ("cat /proc/cmdline"), "pxe")) {
+        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+    }
+    bkpinfo->prefix = tmp1;
+
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
         /* We need to override prefix value in PXE mode as it's 
         * already done in start-nfs */
@@ -793 +797 @@
             fatal_error("no imgname variable in environment");
         }
-        strcpy(bkpinfo->prefix,envtmp1);
+        mr_free(bkpinfo->prefix);
+        mr_asprintf(&tmp1, "%s", envtmp1);
+        bkpinfo->prefix = tmp1;
     }