Changeset 2271 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

r3223@localhost: bruno | 2009-07-11 14:17:24 +0200
Replace sprintf by mr_asprintf in libmondo-cli.c

File:

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

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

@@ -89 +89 @@
 
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
     char flag_val[128][MAX_STR_LEN];
     bool flag_set[128];
 
-    tmp = malloc(9*MAX_STR_LEN);
     for (i = 0; i < 128; i++) {
         flag_val[i][0] = '\0';
@@ -109 +108 @@
         retval += res;
     }
-/*
-  if (!retval)
-    {
-*/
     log_msg(3, "Switches:-");
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            sprintf(tmp, "-%c %s", i, flag_val[i]);
+            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
-        }
-    }
-//    }
-    sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+            mr_free(tmp);
+        }
+    }
+    mr_asprintf(&tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
+    mr_free(tmp);
+
     sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
             "/mondo.scratch.%ld", random() % 32767);
-    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -148 +149 @@
 {
     int j;
-    char tmp[MAX_STR_LEN], *p, comment[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN], *p, 
+    char *comment = NULL;
 
     assert(bkpinfo != NULL);
@@ -159 +161 @@
         *(strchr(tmp, ',')) = '\0';
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        sprintf(comment, "media_size[%d] = %ld", j,
-                bkpinfo->media_size[j]);
+        mr_asprintf(&comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
         log_msg(3, comment);
+        mr_free(comment);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -668 +670 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *psz = NULL;
     char *p = NULL;
@@ -904 +907 @@
         }
         flag_set['d'] = TRUE;
-        sprintf(tmp,
+        mr_asprintf(&tmp1,
                 "You didn't specify a tape streamer device. I'm assuming %s",
                 flag_val['d']);
-        log_to_screen(tmp);
+        log_to_screen(tmp1);
+        mr_free(tmp1);
         percent = 0;
     }
@@ -1015 +1019 @@
             strcpy(bkpinfo->nfs_mount,tmp);
         }
-        sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
+        mr_asprintf(&tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
         strncpy(bkpinfo->isodir,
-                call_program_and_get_last_line_of_output(tmp),
+                call_program_and_get_last_line_of_output(tmp1),
                 MAX_STR_LEN / 4);
+        mr_free(tmp1);
+
         if (strlen(bkpinfo->isodir) < 3) {
             log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
-            sprintf(tmp, "mount %s", bkpinfo->nfs_mount);
-            if (system(tmp)) {
+            mr_asprintf(&tmp1, "mount %s", bkpinfo->nfs_mount);
+            i = system(tmp1);
+            mr_free(tmp1);
+            if (i) {
                 log_to_screen("Unable to mount NFS share %s. Please mount manually.\n", bkpinfo->nfs_mount);
                 retval++;
             } else {
-                sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3",
-                    bkpinfo->nfs_mount);
+                mr_asprintf(&tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
                 strncpy(bkpinfo->isodir,
-                        call_program_and_get_last_line_of_output(tmp),
+                        call_program_and_get_last_line_of_output(tmp1),
                         MAX_STR_LEN / 4);
+                mr_free(tmp1);
+
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
@@ -1124 +1133 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         lastpos = 0;
         while ((token = mr_strtok(flag_val['E'], token_chars, &lastpos)) != NULL) {
@@ -1227 +1236 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            sprintf(tmp,
+            mr_asprintf(&tmp1,
                     "You specified kernel '%s', which does not exist\n",
                     bkpinfo->kernel_path);
-            log_to_screen(tmp);
+            log_to_screen(tmp1);
+            mr_free(tmp1);
         }
     }
@@ -1242 +1252 @@
         if (flag_set['i']) {
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
-            sprintf(tmp, "ls -l %s", bkpinfo->isodir);
-            if (run_program_and_log_output(tmp, 2)) {
+            mr_asprintf(&tmp1, "ls -l %s", bkpinfo->isodir);
+            if (run_program_and_log_output(tmp1, 2)) {
+                mr_free(tmp1);
                 fatal_error
                     ("output folder does not exist - please create it");
             }
+            mr_free(tmp1);
         } else if (flag_set['n']) {
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
@@ -1257 +1269 @@
         mr_asprintf(&tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
         if (bkpinfo->nfs_user) {
-            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
+            mr_asprintf(&tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
         } else {
-            sprintf(tmp, "echo hi > %s", tmp1);
-        }
-        if (run_program_and_log_output(tmp, 2)) {
+            mr_asprintf(&tmp2, "echo hi > %s", tmp1);
+        }
+        i = run_program_and_log_output(tmp2, 2);
+        mr_free(tmp2);
+
+        if (i) {
             retval++;
-            sprintf(tmp,
+            mr_asprintf(&tmp2,
                     "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
                     bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
-            log_to_screen(tmp);
+            log_to_screen(tmp2);
+            mr_free(tmp2);
         }
         unlink(tmp1);
-        paranoid_free(tmp1);
+        mr_free(tmp1);
     }
 
@@ -1311 +1327 @@
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
-        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->tmpdir);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(&tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
+        i = run_program_and_log_output(tmp1, 1);
+        mr_free(tmp1);
+
+        if (i) {
             retval++;
-            log_to_screen
-                ("Please specify a tempdir which I can write to. :)");
+            log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(&tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        i = run_program_and_log_output(tmp1, 1);
+        mr_free(tmp1);
+
+        if (i) {
             retval++;
-            log_to_screen
-                ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
+            log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
             fatal_error("I cannot write to the tempdir you specified.");
         }