Changeset 2262 in MondoRescue

Timestamp:

Jul 12, 2009, 2:04:30 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3203@localhost: bruno | 2009-07-06 19:21:29 +0200

• Replace sprintf by mr_asprintf in libmondo-tools.c

File:

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

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

@@ -414 +414 @@
     char *extra_cdrom_params = NULL;
     char *mondo_mkisofs_sz = NULL;
-    char *command;
+    char *command = NULL;
     char *mtpt;
     char *hostname;
@@ -421 +421 @@
     char *colon;
     char *cdr_exe;
-    char *tmp;
+    char *tmp = NULL;
     char call_before_iso_user[MAX_STR_LEN] = "\0";
     /*
@@ -427 +427 @@
     int rdsiz_MB;
     */
-    char *iso_dev;
-    char *iso_mnt;
-    char *iso_tmp;
-    char *iso_path;
+    char *iso_dev = NULL;
+    char *iso_mnt = NULL;
+    char *iso_tmp = NULL;
+    char *iso_path = NULL;
 
     assert(bkpinfo != NULL);
-    malloc_string(command);
     malloc_string(mtpt);
     malloc_string(hostname);
     malloc_string(cdr_exe);
-    malloc_string(tmp);
-    malloc_string(iso_dev);
-    malloc_string(iso_mnt);
-    malloc_string(iso_tmp);
-    malloc_string(iso_path);
     bkpinfo->optimal_set_size =
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
@@ -449 +443 @@
     if (bkpinfo->backup_media_type == tape) {
         log_msg(1, "Bar");
-        sprintf(tmp, "mt -f %s status", bkpinfo->media_device);
+        mr_asprintf(&tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
         if (run_program_and_log_output(tmp, 3)) {
+            mr_free(tmp);
             fatal_error
                 ("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
         }
+        mr_free(tmp);
     }
     make_hole_for_dir(bkpinfo->scratchdir);
@@ -526 +522 @@
         }
         if (getenv ("SUDO_COMMAND")) {
-            sprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
+            mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
             if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
+                mr_free(command);
                 popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
                 fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
             }       
+            mr_free(command);
         }
         log_msg(2, "call_make_iso (DVD res) is ... %s",
@@ -602 +600 @@
     }                           // end of CD code
 
-    /*
-       if (bkpinfo->backup_data && bkpinfo->backup_media_type == tape)
-       {
-       sprintf (tmp,
-       "dd if=/dev/zero of=%s bs=%ld count=32 2> /dev/null",
-       bkpinfo->media_device, bkpinfo->internal_tape_block_size);
-       if (system(tmp))
-       {
-       retval++;
-       fprintf (stderr,
-       "Cannot write to tape device. Is the tape set read-only?\n");
-       }
-       } // end of tape code
-     */
-
-
     if (bkpinfo->backup_media_type == iso) {
 
@@ -628 +610 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        sprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1",
+        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
                 bkpinfo->isodir);
         log_it("command = %s", command);
-        log_it("res of it = %s",
-               call_program_and_get_last_line_of_output(command));
-        sprintf(iso_dev, "%s",
-                call_program_and_get_last_line_of_output(command));
-        sprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp,
-                                  call_program_and_get_last_line_of_output
-                                  (command));
-
-        sprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
-                iso_dev);
+        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&iso_dev, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
+        mr_free(tmp);
+        mr_free(command);
+
+        mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3", iso_dev);
+        mr_free(iso_dev);
+
         log_it("command = %s", command);
-        log_it("res of it = %s",
-               call_program_and_get_last_line_of_output(command));
-        sprintf(iso_mnt, "%s",
-                call_program_and_get_last_line_of_output(command));
-        sprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp,
-                                  call_program_and_get_last_line_of_output
-                                  (command));
+        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, call_program_and_get_last_line_of_output(command));
+        mr_free(tmp);
+        mr_free(command);
+
         log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
-        sprintf(iso_tmp, "%s", bkpinfo->isodir);
+        mr_asprintf(&iso_tmp, "%s", bkpinfo->isodir);
         if (strlen(iso_tmp) < strlen(iso_mnt)) {
-            iso_path[0] = '\0';
+            mr_asprintf(&iso_path, "%s", "");
         } else {
-            sprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
-        }
-        sprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);
+            mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+        }
+        mr_free(iso_tmp);
+
+        mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, iso_path);
+        mr_free(tmp);
+
         log_it("isodir: %s", iso_path);
-        sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        mr_free(iso_path);
+
+        mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, bkpinfo->prefix);
+        mr_free(tmp);
+
         log_it("iso-prefix: %s",  bkpinfo->prefix);
 
@@ -710 +698 @@
     g_backup_media_type = bkpinfo->backup_media_type;
     paranoid_free(mtpt);
-    paranoid_free(command);
     paranoid_free(hostname);
     paranoid_free(cdr_exe);
-    paranoid_free(tmp);
-    paranoid_free(iso_dev);
-    paranoid_free(iso_mnt);
-    paranoid_free(iso_tmp);
-    paranoid_free(iso_path);
     return (retval);
 }
@@ -872 +854 @@
 long free_space_on_given_partition(char *partition)
 {
-    char command[MAX_STR_LEN], out_sz[MAX_STR_LEN];
+    char *out_sz = NULL;
+    char *command = NULL;
     long res;
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    sprintf(command, "df -m -P %s 1> /dev/null 2> /dev/null", partition);
+    mr_asprintf(&command, "df -m -P %s 1> /dev/null 2> /dev/null", partition);
     if (system(command)) {
+        mr_free(command);
         return (-1);
     }                           // partition does not exist
-    sprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+    mr_free(command);
+
+    mr_asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
             partition);
-    strcpy(out_sz, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&out_sz, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (strlen(out_sz) == 0) {
+        mr_free(out_sz);
         return (-1);
     }                           // error within df, probably
     res = atol(out_sz);
+    mr_free(out_sz);
     return (res);
 }
@@ -908 +898 @@
 
     /*@ buffers ************ */
-    char tmp[MAX_STR_LEN];
-    //  char command[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /*@ int's *************** */
@@ -924 +913 @@
             ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    strcpy(tmp,
+    mr_asprintf(&tmp, "%s",
            call_program_and_get_last_line_of_output
            ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
@@ -935 +924 @@
             ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     }
+    mr_free(tmp);
 #endif
 
@@ -996 +986 @@
     run_program_and_log_output
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    strcpy(tmp,
+    mr_asprintf(&tmp, "%s",
            call_program_and_get_last_line_of_output
            ("mount | grep -E \"cdr(om|w)\""));
@@ -1011 +1001 @@
             if (run_program_and_log_output("uname -a | grep Knoppix", 5)) {
             retval++;
-            fatal_error
-                ("Your CD-ROM drive is mounted. Please unmount it.");
-        }
-    }
+            mr_free(tmp);
+            fatal_error("Your CD-ROM drive is mounted. Please unmount it.");
+        }
+    }
+    mr_free(tmp);
 
     run_program_and_log_output("cat /etc/fstab", 5);
@@ -1030 +1021 @@
         fatal_error("Please reinstall Mondo and Mindi.");
     }
-    sprintf(tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 5)) {
-        sprintf(tmp, "mindi --makemountlist %s/mountlist.txt.test failed for some reason.", bkpinfo->tmpdir);
+        mr_free(tmp);
+        mr_asprintf(&tmp, "mindi --makemountlist %s/mountlist.txt.test failed for some reason.", bkpinfo->tmpdir);
         log_to_screen(tmp);
         log_to_screen
@@ -1042 +1034 @@
         retval++;
     }
+    mr_free(tmp);
 
     if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
@@ -1068 +1061 @@
 {
     /*@ buffer ****************************************************** */
-    char command[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1076 +1069 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        sprintf(tmp, "(read_cfg_var) Cannot find %s config file",
+        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
                 config_file);
         log_to_screen(tmp);
+        mr_free(tmp);
+
         value[0] = '\0';
         return (1);
@@ -1085 +1080 @@
         return (0);
     } else {
-        sprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+        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_free(command);
+
         if (strlen(value) == 0) {
             return (1);
@@ -1153 +1150 @@
 void stop_autofs_if_necessary()
 {
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     g_autofs_exe[0] = '\0';
@@ -1166 +1163 @@
     } else {
         log_msg(3, "%s --- autofs detected", g_autofs_exe);
-// FIXME -- only disable it if it's running ---  sprintf(tmp, "%s status", autofs_exe);
-        sprintf(tmp, "%s stop", g_autofs_exe);
+        // FIXME -- only disable it if it's running ---  sprintf(tmp, "%s status", autofs_exe);
+        mr_asprintf(&tmp, "%s stop", g_autofs_exe);
         if (run_program_and_log_output(tmp, 2)) {
             log_it("Failed to stop autofs - I assume it wasn't running");
@@ -1174 +1171 @@
             log_it("Stopped autofs OK");
         }
+        mr_free(tmp);
     }
 }
@@ -1182 +1180 @@
 void restart_autofs_if_necessary()
 {
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     if (!g_autofs_stopped || !g_autofs_exe[0]) {
@@ -1188 +1186 @@
         return;
     }
-    sprintf(tmp, "%s start", g_autofs_exe);
+    mr_asprintf(&tmp, "%s start", g_autofs_exe);
     if (run_program_and_log_output(tmp, 2)) {
         log_it("Failed to start autofs");
@@ -1195 +1193 @@
         log_it("Started autofs OK");
     }
+    mr_free(tmp);
 }
 
@@ -1203 +1202 @@
 void mount_boot_if_necessary()
 {
-    char tmp[MAX_STR_LEN];
-    char command[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *command = NULL;
 
     log_msg(1, "Started sub");
@@ -1210 +1209 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    strcpy(command,
+    mr_asprintf(&command, "%s",
            "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     log_msg(4, "tmp = '%s'", tmp);
     if (tmp[0]) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
-        strcpy(command, "mount | grep -Ew '/boot'");
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&command, "mount | grep -Ew '/boot'");
+        mr_free(tmp);
+        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+
         if (!strcmp(tmp,"")) {
             if ((strstr(tmp, "LABEL=") || strstr(tmp,"UUID="))) {
@@ -1228 +1232 @@
                 }
             } else {
-                sprintf(command, "mount | grep -E '^%s'", tmp);
+                mr_asprintf(&command, "mount | grep -E '^%s'", tmp);
                 log_msg(3, "command = %s", command);
                 if (run_program_and_log_output(command, 5)) {
                     strcpy(g_boot_mountpt, tmp);
-                    sprintf(tmp,
+                    mr_free(tmp);
+                    mr_asprintf(&tmp,
                             "%s (your /boot partition) is not mounted. I'll mount it before backing up",
                             g_boot_mountpt);
                     log_it(tmp);
-                    sprintf(tmp, "mount %s", g_boot_mountpt);
+                    mr_free(tmp);
+
+                    mr_asprintf(&tmp, "mount %s", g_boot_mountpt);
                     if (run_program_and_log_output(tmp, 5)) {
                         g_boot_mountpt[0] = '\0';
@@ -1248 +1255 @@
                         }
                     }
+                    mr_free(tmp);
                 }
+                mr_free(command);
             }
         }
@@ -1261 +1270 @@
 void unmount_boot_if_necessary()
 {
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     log_msg(3, "starting");
     if (g_boot_mountpt[0]) {
-        sprintf(tmp, "umount %s", g_boot_mountpt);
+        mr_asprintf(&tmp, "umount %s", g_boot_mountpt);
         if (run_program_and_log_output(tmp, 5)) {
             log_it("WARNING - unable to unmount /boot");
         }
+        mr_free(tmp);
     }
     log_msg(3, "leaving");
@@ -1286 +1296 @@
 {
     /*@ buffers ***************************************************** */
-    char command[MAX_STR_LEN * 2];
-    char tempfile[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *command = NULL;
+    char *tempfile = NULL;
+    char *tmp = NULL;
 
 
@@ -1296 +1306 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        sprintf(tmp, "(write_cfg_file) Cannot find %s config file",
+        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
                 config_file);
         log_to_screen(tmp);
+        mr_free(tmp);
         return (1);
     }
-    sprintf(tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
+    mr_asprintf(&tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
-        sprintf(command, "grep -vE '^%s .*$' %s > %s",
+        mr_sprintf(&command, "grep -vE '^%s .*$' %s > %s",
                 label, config_file, tempfile);
         paranoid_system(command);
-    }
-    sprintf(command, "echo \"%s %s\" >> %s", label, value, tempfile);
+        mr_free(command);
+    }
+    mr_asprintf(&command, "echo \"%s %s\" >> %s", label, value, tempfile);
     paranoid_system(command);
-    sprintf(command, "mv -f %s %s", tempfile, config_file);
+    mr_free(command);
+
+    mr_asprintf(&command, "mv -f %s %s", tempfile, config_file);
     paranoid_system(command);
+    mr_free(command);
     unlink(tempfile);
+    mr_free(tempfile);
     return (0);
 }
@@ -1475 +1491 @@
 void restart_magicdev_if_necessary()
 {
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     if (g_magicdev_command && g_magicdev_command[0]) {
-        sprintf(tmp, "%s &", g_magicdev_command);
+        mr_asprintf(&tmp, "%s &", g_magicdev_command);
         paranoid_system(tmp);
-    }
-    paranoid_free(tmp);
+        mr_free(tmp);
+    }
 }