Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-fork.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-fork.c (modified) (8 diffs)

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

@@ -38 +38 @@
     /*@ buffers ***************************************************** */
     static char result[512];
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -44 +44 @@
 
     /*@ initialize data ********************************************* */
-    malloc_string(tmp);
     result[0] = '\0';
-    tmp[0] = '\0';
 
     /*@******************************************************************** */
@@ -52 +50 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-             fgets(tmp, MAX_STR_LEN, fin)) {
+        for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
             if (strlen(tmp) > 1) {
-                strcpy(result, tmp);
-            }
-        }
+                strncpy(result, 511, tmp);
+            }
+            mr_free(tmp);
+        }
+        mr_free(tmp);
         paranoid_pclose(fin);
     } else {
@@ -63 +62 @@
     }
     strip_spaces(result);
-    paranoid_free(tmp);
     return (result);
 }
@@ -163 +161 @@
         mr_free(command);
         command = tmp2;
-#ifndef _XWIN
         if (!g_text_mode) {
             newtSuspend();
         }
-#endif
         log_msg(1, "command = '%s'", command);
         retval += system(command);
@@ -294 +290 @@
     fin = fopen(tmp1, "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN, fin)) {
+        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin); fgets(incoming, MAX_STR_LEN, fin)) {
             p = incoming;
             while (p && *p) {
@@ -304 +299 @@
             }
             strip_spaces(incoming);
-            if ((res == 0 && log_if_success)
-                || (res != 0 && log_if_failure)) {
+            if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
                 log_msg(0, incoming);
             }
@@ -375 +369 @@
         }
     }
-#ifdef _XWIN
-    /* This only can update when newline goes into the file,
-       but it's *much* prettier/faster on Qt. */
-    while (does_file_exist(lockfile)) {
-        while (!feof(fin)) {
-            if (!fgets(tmp1, 512, fin))
-                break;
-            log_to_screen(tmp1);
-        }
-        usleep(500000);
-    }
-#else
-    /* This works on Newt, and it gives quicker updates. */
+
     for (; does_file_exist(lockfile); sleep(1)) {
         log_file_end_to_screen(MONDO_LOGFILE, "");
         update_evalcall_form(1);
     }
-#endif
+
     /* Evaluate the status returned by pclose to get the exit code of the called program. */
     errno = 0;