Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/newt-specific.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/common/newt-specific.c (modified) (12 diffs)

branches/3.0/mondo/src/common/newt-specific.c

@@ -296 +296 @@
 char *tmp1 = NULL;
 
-    mr_asprintf(&tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", ps_options, str , ps_proc_id);
+    mr_asprintf(tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", ps_options, str , ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
     if (strlen(tmp) > 0) {
-        mr_asprintf(&tmp1,"kill `%s`", tmp);
+        mr_asprintf(tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
         paranoid_free(tmp1);
@@ -434 +434 @@
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
-            mr_asprintf(&command, "umount -d %s", g_selfmounted_isodir);
+            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);
-            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
             paranoid_free(command);
@@ -456 +456 @@
             if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) {
                 log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
                 paranoid_system(command);
                 mr_free(command);
@@ -465 +465 @@
             if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) {
                 log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
-                mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
+                mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
                 paranoid_system(command);
                 mr_free(command);
@@ -515 +515 @@
         }
         if (grep_for_me[0] != '\0') {
-            mr_asprintf(&command, "grep '%s' %s | tail -n%d",
+            mr_asprintf(command, "grep '%s' %s | tail -n%d",
                     grep_for_me, filename, g_noof_log_lines);
         } else {
-            mr_asprintf(&command, "tail -n%d %s", g_noof_log_lines,
+            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines,
                     filename);
         }
@@ -536 +536 @@
                     */
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        mr_asprintf(&tmp, "%s", err_log_lines[i] + 6);
+                        mr_asprintf(tmp, "%s", err_log_lines[i] + 6);
                         strncpy(err_log_lines[i], tmp, (size_t)MAX_NEWT_COMMENT_LEN);
                         mr_free(tmp);
@@ -1074 +1074 @@
                     (long) time_remaining % 60);
             if (percentage < 3) {
-                mr_asprintf(&pcline_str, " Working");
+                mr_asprintf(pcline_str, " Working");
                 for (j = 0; j < g_mysterious_dot_counter; j++) {
                     mr_strcat(pcline_str, ".");
@@ -1083 +1083 @@
                 mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                mr_asprintf(&pcline_str, " %3d%% done              %3d%% to go",
+                mr_asprintf(pcline_str, " %3d%% done              %3d%% to go",
                         percentage, 100 - percentage);
             }
             if (g_text_mode) {
-                mr_asprintf(&taskprogress, "TASK:  [");
+                mr_asprintf(taskprogress, "TASK:  [");
                 for (i = 0; i < percentage; i += 5) {
                     mr_strcat(taskprogress, "*");
@@ -1234 +1234 @@
             printf("---progress-form---3--- %s\n", blurb3);
             printf("---progress-form---E---\n");
-            mr_asprintf(&taskprogress, "TASK:  [");
+            mr_asprintf(taskprogress, "TASK:  [");
             for (i = 0; i < percentage; i += 5) {
                 mr_strcat(taskprogress, "*");
@@ -1443 +1443 @@
         newtPopWindow();
         if (b_res == b1) {
-            mr_asprintf(&output, "%s", "bzip2");
+            mr_asprintf(output, "%s", "bzip2");
         } else if (b_res == b2) {
-            mr_asprintf(&output, "%s", "gzip");
+            mr_asprintf(output, "%s", "gzip");
         } else if (b_res == b3) {
-            mr_asprintf(&output, "%s", "lzo");
+            mr_asprintf(output, "%s", "lzo");
         //} else if (b_res == b4) {
-            //mr_asprintf(&output, "%s", "lzma");
+            //mr_asprintf(output, "%s", "lzma");
         }
         newtPopHelpLine();
@@ -1540 +1540 @@
         }
 
-        mr_asprintf(&tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
+        mr_asprintf(tmp1,"%s/icantfindthesefiles.txt",bkpinfo->tmpdir);
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
@@ -1637 +1637 @@
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            mr_asprintf(&tmp, "0   ");
+            mr_asprintf(tmp, "0   ");
         } else if (flentry->severity == 1) {
-            mr_asprintf(&tmp, "low ");
+            mr_asprintf(tmp, "low ");
         } else if (flentry->severity == 2) {
-            mr_asprintf(&tmp, "med ");
-        } else {
-            mr_asprintf(&tmp, "high");
+            mr_asprintf(tmp, "med ");
+        } else {
+            mr_asprintf(tmp, "high");
         }
         mr_strcat(tmp, "  ");