Changeset 3871 in MondoRescue for branches/3.3/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix syntax issues

Location:

branches/3.3/mondo/src/common

Files:

• lib-common-externs.h (deleted)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-files.c (modified) (3 diffs)
• libmondo-fork.c (modified) (3 diffs)
• libmondo-raid.c (modified) (1 diff)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.c (modified) (1 diff)
• libmondo-tools.c (modified) (2 diffs)
• libmondo-verify.c (modified) (1 diff)
• newt-specific-EXT.h (modified) (1 diff)
• newt-specific.c (modified) (3 diffs)

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
+
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -675 +675 @@
 
     if ((tmp = find_home_of_exe("setfacl")) != NULL) {
-        i = set_EXAT_list(masklist, facl_fname, tmp)
+        i = set_EXAT_list(masklist, acl_fname, tmp);
         mr_free(tmp);
     } else {

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

@@ -13 +13 @@
 #include "mr_file.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
+
 #include "libmondo-tools-EXT.h"
 #include "libmondo-gui-EXT.h"
@@ -19 +19 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
+#include "libmondo-newt-specific-EXT.h"
 
 /*@unused@*/
@@ -24 +25 @@
 
 extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN];
-
-extern char *mr_popup_and_get_string(const char *, const char *, const char *);
 
 extern int g_currentY;

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.

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

@@ -16 +16 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "lib-common-externs.h"
+
 #include "mr_mem.h"
 #include "mr_str.h"

branches/3.3/mondo/src/common/libmondo-string-EXT.h

@@ -34 +34 @@
 
 extern char *media_descriptor_string(t_bkptype);
+
+extern char *mr_center_string(char *in, int width);
+

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

@@ -11 +11 @@
 #include "mr_str.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
+
 #include "libmondo-files-EXT.h"
 #include "libmondo-gui-EXT.h"

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

@@ -13 +13 @@
 #include "mr_sys.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
+
 #include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -236 +236 @@
 #endif
     log_msg(1, "g_kernel_version = %f", d);
-    return (d);
+
+    if (g_kernel_version < 2.6) {
+        fatal_error("Please use MondoRescue < 3.3.0 to support that old kernel or upgrade your distribution :-)");
+    }
+    return(d);
 }
 

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

@@ -19 +19 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "lib-common-externs.h"
+
 
 /*@unused@*/

branches/3.3/mondo/src/common/newt-specific-EXT.h

@@ -15 +15 @@
 extern void log_to_screen(const char *fmt, ...);
 extern void popup_and_OK(const char *prompt);
-extern bool popup_and_get_string(char *title, char *b, char *output,
-                                 int maxsize);
+extern bool popup_and_get_string(char *title, char *b, char *output, int maxsize);
+extern char *mr_popup_and_get_string(char *title, char *b, char *output, int maxsize);
 extern bool popup_with_buttons(char *p, char *button1, char *button2);
 extern void refresh_log_screen();

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

@@ -28 +28 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-gui-EXT.h"
-#include "lib-common-externs.h"
+
 
 extern char *MONDO_LOGFILE;
 
 extern struct s_bkpinfo *bkpinfo;
-
-extern char *mr_center_string(char *in, int width);
 
 /*@unused@*/
@@ -639 +637 @@
 
 /**
+ * Update the progress form's complete blurb and show @p g_current_progress.
+ * @param blurb1 The first line of the blurb. Use @p g_blurb_str_1 to keep it unchanged.
+ * @param blurb2 The second line of the blurb. Use @p g_blurb_str_3 (no, that's not a typo) to keep it the same.
+ * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
+ */
+void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
+
+        /*@ long ***************************************************** */
+        long current_time = 0L;
+        long time_taken = 0L;
+        long time_remaining = 0L;
+        long time_total_est = 0L;
+
+        char *blurb1_str = NULL;
+        char *blurb2_str = NULL;
+        char *blurb3_str = NULL;
+
+        /*@ int ******************************************************* */
+        int percentage = 0;
+        int i = 0;
+
+        /*@ buffers *************************************************** */
+        char *percentline_str = NULL;
+        char *timeline_str = NULL;
+        char *taskprogress = NULL;
+
+        if (!g_text_mode) {
+            assert(blurb1 != NULL);
+            assert(blurb2 != NULL);
+            assert(blurb3 != NULL);
+            assert(g_timeline != NULL);
+        }
+
+        current_time = get_time();
+        time_taken = current_time - g_start_time;
+        if (g_maximum_progress == 0) {
+            percentage = 0;
+        } else {
+            if (g_current_progress > g_maximum_progress) {
+                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
+                g_current_progress = g_maximum_progress;
+            }
+            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
+        }
+        if (percentage < 1) {
+            percentage = 1;
+        }
+        if (percentage > 100) {
+            percentage = 100;
+        }
+        if (g_current_progress) {
+            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
+            time_remaining = time_total_est - time_taken;
+        } else {
+            time_remaining = 0L;
+        }
+        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        if (g_text_mode) {
+            printf("---progress-form---1--- %s\n", blurb1);
+            printf("---progress-form---2--- %s\n", blurb2);
+            printf("---progress-form---3--- %s\n", blurb3);
+            printf("---progress-form---E---\n");
+            mr_asprintf(taskprogress, "TASK:  [");
+            for (i = 0; i < percentage; i += 5) {
+                mr_strcat(taskprogress, "*");
+            }
+            for (; i < 100; i += 5) {
+                mr_strcat(taskprogress, ".");
+            }
+            if (percentage > 100) {
+                log_msg(2, "percentage = %d", percentage);
+            }
+            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
+            printf("---progress-form---4--- %s\n", taskprogress);
+            paranoid_free(taskprogress);
+        } else {
+            mr_asprintf(timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
+
+            blurb1_str = mr_center_string(blurb1, 54);
+            blurb2_str = mr_center_string(blurb2, 54);
+            blurb3_str = mr_center_string(blurb3, 54);
+            if (g_blurb1) {
+                newtLabelSetText(g_blurb1, blurb1_str);
+            }
+            if (g_blurb2) {
+                // Not a typo but ridiculous !
+                newtLabelSetText(g_blurb2, blurb3_str);
+            }
+            if (g_blurb3) {
+                // Not a typo but ridiculous !
+                newtLabelSetText(g_blurb3, blurb2_str);
+            }
+            newtScaleSet(g_scale, (unsigned long long) g_current_progress);
+            if ((percentage >= 2) && (g_timeline)) {
+                newtLabelSetText(g_timeline, timeline_str);
+            }
+            mr_free(timeline_str);
+
+            if (g_percentline) {
+                newtLabelSetText(g_percentline, percentline_str);
+            }
+            mr_free(percentline_str);
+            mr_free(blurb1_str);
+            mr_free(blurb2_str);
+            mr_free(blurb3_str);
+
+            newtDrawForm(g_progressForm);
+            newtRefresh();
+        }
+    }
+
+
+/**
  * Open a progress form with title @p title.
  * @param title The title to use for the progress form (will be put in the title bar on Newt).
@@ -1109 +1221 @@
         update_progress_form_full(g_blurb_str_1, g_blurb_str_2, g_blurb_str_3);
 }
-
-
-/**
- * Update the progress form's complete blurb and show @p g_current_progress.
- * @param blurb1 The first line of the blurb. Use @p g_blurb_str_1 to keep it unchanged.
- * @param blurb2 The second line of the blurb. Use @p g_blurb_str_3 (no, that's not a typo) to keep it the same.
- * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
- */
-void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
-
-        /*@ long ***************************************************** */
-        long current_time = 0L;
-        long time_taken = 0L;
-        long time_remaining = 0L;
-        long time_total_est = 0L;
-
-        char *blurb1_str = NULL;
-        char *blurb2_str = NULL;
-        char *blurb3_str = NULL;
-
-        /*@ int ******************************************************* */
-        int percentage = 0;
-        int i = 0;
-
-        /*@ buffers *************************************************** */
-        char *percentline_str = NULL;
-        char *timeline_str = NULL;
-        char *taskprogress = NULL;
-
-        if (!g_text_mode) {
-            assert(blurb1 != NULL);
-            assert(blurb2 != NULL);
-            assert(blurb3 != NULL);
-            assert(g_timeline != NULL);
-        }
-
-        current_time = get_time();
-        time_taken = current_time - g_start_time;
-        if (g_maximum_progress == 0) {
-            percentage = 0;
-        } else {
-            if (g_current_progress > g_maximum_progress) {
-                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
-                g_current_progress = g_maximum_progress;
-            }
-            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
-        }
-        if (percentage < 1) {
-            percentage = 1;
-        }
-        if (percentage > 100) {
-            percentage = 100;
-        }
-        if (g_current_progress) {
-            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
-            time_remaining = time_total_est - time_taken;
-        } else {
-            time_remaining = 0L;
-        }
-        g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        if (g_text_mode) {
-            printf("---progress-form---1--- %s\n", blurb1);
-            printf("---progress-form---2--- %s\n", blurb2);
-            printf("---progress-form---3--- %s\n", blurb3);
-            printf("---progress-form---E---\n");
-            mr_asprintf(taskprogress, "TASK:  [");
-            for (i = 0; i < percentage; i += 5) {
-                mr_strcat(taskprogress, "*");
-            }
-            for (; i < 100; i += 5) {
-                mr_strcat(taskprogress, ".");
-            }
-            if (percentage > 100) {
-                log_msg(2, "percentage = %d", percentage);
-            }
-            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
-            printf("---progress-form---4--- %s\n", taskprogress);
-            paranoid_free(taskprogress);
-        } else {
-            mr_asprintf(timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
-            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
-
-            blurb1_str = mr_center_string(blurb1, 54);
-            blurb2_str = mr_center_string(blurb2, 54);
-            blurb3_str = mr_center_string(blurb3, 54);
-            if (g_blurb1) {
-                newtLabelSetText(g_blurb1, blurb1_str);
-            }
-            if (g_blurb2) {
-                // Not a typo but ridiculous !
-                newtLabelSetText(g_blurb2, blurb3_str);
-            }
-            if (g_blurb3) {
-                // Not a typo but ridiculous !
-                newtLabelSetText(g_blurb3, blurb2_str);
-            }
-            newtScaleSet(g_scale, (unsigned long long) g_current_progress);
-            if ((percentage >= 2) && (g_timeline)) {
-                newtLabelSetText(g_timeline, timeline_str);
-            }
-            mr_free(timeline_str);
-
-            if (g_percentline) {
-                newtLabelSetText(g_percentline, percentline_str);
-            }
-            mr_free(percentline_str);
-            mr_free(blurb1_str);
-            mr_free(blurb2_str);
-            mr_free(blurb3_str);
-
-            newtDrawForm(g_progressForm);
-            newtRefresh();
-        }
-    }