Changeset 56 in MondoRescue

Timestamp:

Oct 9, 2005, 1:47:23 AM (20 years ago)

Author:

bcornec

Message:

asprintf for newt-specific.c (first step)

File:

• trunk/mondo/mondo/common/newt-specific.c (modified) (11 diffs)

trunk/mondo/mondo/common/newt-specific.c

@@ -262 +262 @@
         /*@ end vars **************************************************** */
 
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -270 +269 @@
             log_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
-            paranoid_free(tmp);
             finish(1);
         }
@@ -278 +276 @@
                 log_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
-                paranoid_free(tmp);
                 finish(1);
             }
@@ -286 +283 @@
         if (already_exiting) {
             log_msg(3, "...I'm already exiting. Give me time, Julian!");
-            paranoid_free(tmp);
             finish(1);
         }
@@ -297 +293 @@
         kill_anything_like_this("partimagehack");
         sync();
-        sprintf(tmp, "umount %s", g_tmpfs_mountpt);
+        asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
         chdir("/");
         for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
@@ -304 +300 @@
             run_program_and_log_output(tmp, 5);
         }
+        paranoid_free(tmp);
 
         if (g_erase_tmpdir_and_scratchdir[0]) {
@@ -349 +346 @@
             log_msg(3, "FYI - g_main_pid is blank");
         }
-        paranoid_free(tmp);
         finish(254);
     }
@@ -419 +415 @@
         int i = 0;
 
-        malloc_string(command);
-        malloc_string(tmp);
         assert_string_is_neither_NULL_nor_zerolength(filename);
         assert(grep_for_me != NULL);
 
         if (!does_file_exist(filename)) {
-            paranoid_free(command);
-            paranoid_free(tmp);
             return;
         }
         if (grep_for_me[0] != '\0') {
-            sprintf(command, "cat %s | grep \"%s\" | tail -n%d", filename,
+            asprintf(&command, "cat %s | grep \"%s\" | tail -n%d", filename,
                     grep_for_me, g_noof_log_lines);
         } else {
-            sprintf(command, "cat %s | tail -n%d", filename,
+            asprintf(&command, "cat %s | tail -n%d", filename,
                     g_noof_log_lines);
         }
@@ -447 +439 @@
                     strip_spaces(err_log_lines[i]);
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        strcpy(tmp, err_log_lines[i] + 6);
+                        asprintf(&tmp, "%s", err_log_lines[i] + 6);
                         strcpy(err_log_lines[i], tmp);
+                        paranoid_free(tmp);
                     }
                     if (feof(fin)) {
@@ -459 +452 @@
         refresh_log_screen();
         paranoid_free(command);
-        paranoid_free(tmp);
     }
 
@@ -479 +471 @@
         char *output;
 
-        malloc_string(output);
 
         va_start(args, fmt);
-        vsprintf(output, fmt, args);
+        vasprintf(&output, fmt, args);
         log_msg(0, output);
-        output[80] = '\0';
+        if (strlen(output > 80)) {
+            output[80] = '\0';
+        }
         va_end(args);
         i = (int) strlen(output);