Changeset 3871 in MondoRescue for branches/3.3/mondo/src/common/libmondo-fork.c

Timestamp:

Mar 7, 2024, 6:06:33 PM (3 months ago)

Author:

Bruno Cornec

Message:

Fix syntax issues

File:

• branches/3.3/mondo/src/common/libmondo-fork.c (modified) (3 diffs)

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

@@ -15 +15 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "lib-common-externs.h"
+
 
 /*@unused@*/
@@ -87 +87 @@
 #define MONDO_POPMSG  "Your machine will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
 
+
+int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd) {
+
+    /*@ int *************************************************************** */
+    int res = 0;
+    int percentage = 0;
+    int maxpc = 100;
+    int pcno = 0;
+    int counter = 0;
+
+    /*@ buffers *********************************************************** */
+    char *command = NULL;
+    /*@ pointers ********************************************************** */
+    static int chldres = 0;
+    int *pchild_result;
+    pthread_t childthread;
+
+    pchild_result = &chldres;
+    assert_string_is_neither_NULL_nor_zerolength(cmd);
+    assert_string_is_neither_NULL_nor_zerolength(tt);
+    *pchild_result = 999;
+
+    mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    log_msg(3, "command = '%s'", command);
+    if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
+        fatal_error("Unable to create an archival thread");
+    }
+
+    log_msg(8, "Parent running");
+    open_evalcall_form(tt);
+
+    for (sleep(1); command[0] != '\0'; sleep(1)) {
+        if (strstr(cmd,"mindi") != NULL) {
+            pcno = grab_percentage_from_last_line_of_file(MINDI_RUNFILE);
+        } else {
+            pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
+        }
+        if (pcno < 0 || pcno > 100) {
+            log_msg(8, "Weird pc# %d", pcno);
+            continue;
+        }
+        percentage = pcno * 100 / maxpc;
+        if (counter++ >= 5) {
+            counter = 0;
+            log_file_end_to_screen(MONDO_LOGFILE, "");
+        }
+        update_evalcall_form(percentage);
+    }
+    mr_free(command);
+
+    log_file_end_to_screen(MONDO_LOGFILE, "");
+    close_evalcall_form();
+    pthread_join(childthread, (void *) (&pchild_result));
+    if (pchild_result) {
+        res = *pchild_result;
+    } else {
+        res = 666;
+    }
+    log_msg(3, "Parent res = %d", res);
+    return (res);
+}
+
+
 /**
  * Call mkisofs to create an ISO image.
@@ -645 +708 @@
 
 
-
-int run_external_binary_with_percentage_indicator_NEW(char *tt, char *cmd) {
-
-    /*@ int *************************************************************** */
-    int res = 0;
-    int percentage = 0;
-    int maxpc = 100;
-    int pcno = 0;
-    int counter = 0;
-
-    /*@ buffers *********************************************************** */
-    char *command = NULL;
-    /*@ pointers ********************************************************** */
-    static int chldres = 0;
-    int *pchild_result;
-    pthread_t childthread;
-
-    pchild_result = &chldres;
-    assert_string_is_neither_NULL_nor_zerolength(cmd);
-    assert_string_is_neither_NULL_nor_zerolength(tt);
-    *pchild_result = 999;
-
-    mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
-    log_msg(3, "command = '%s'", command);
-    if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
-        fatal_error("Unable to create an archival thread");
-    }
-
-    log_msg(8, "Parent running");
-    open_evalcall_form(tt);
-
-    for (sleep(1); command[0] != '\0'; sleep(1)) {
-        if (strstr(cmd,"mindi") != NULL) {
-            pcno = grab_percentage_from_last_line_of_file(MINDI_RUNFILE);
-        } else {
-            pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
-        }
-        if (pcno < 0 || pcno > 100) {
-            log_msg(8, "Weird pc# %d", pcno);
-            continue;
-        }
-        percentage = pcno * 100 / maxpc;
-        if (counter++ >= 5) {
-            counter = 0;
-            log_file_end_to_screen(MONDO_LOGFILE, "");
-        }
-        update_evalcall_form(percentage);
-    }
-    mr_free(command);
-
-    log_file_end_to_screen(MONDO_LOGFILE, "");
-    close_evalcall_form();
-    pthread_join(childthread, (void *) (&pchild_result));
-    if (pchild_result) {
-        res = *pchild_result;
-    } else {
-        res = 666;
-    }
-    log_msg(3, "Parent res = %d", res);
-    return (res);
-}
-
-
 /**
  * Feed @p input_fifo through ntfsclone (restore) to @p output_device.