Changeset 2421 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

Sep 24, 2009, 3:50:38 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove some compiler warnings on main
• Adds function mr_chomp and mr_strip_char and use them in mr_date and call_program_and_get_last_line_of_output
• Fix call_program_and_get_last_line_of_output to return the right result using a temp file instead of popen
• Fix an issue in mr_getline_int in case of eof (returns now an empty string)
• Sequencing of Init of bkpinfo reviewed

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (3 diffs)
• libmondo-devices.c (modified) (1 diff)
• libmondo-fork.c (modified) (3 diffs)
• libmondo-tools-EXT.h (modified) (1 diff)
• libmondo-tools.c (modified) (5 diffs)
• libmondo-tools.h (modified) (1 diff)
• newt-specific.c (modified) (2 diffs)

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

@@ -993 +993 @@
         if (!does_file_exist(archiving_filelist_fname)) {
             log_msg(3, "[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.", getpid(), this_thread_no, archiving_set_no);
+            mr_free(archiving_afioball_fname);
             break;
         }
@@ -1291 +1292 @@
     malloc_string(result_str);
     transfer_block = malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
-    memset((void *) transfer_block, 0,
-           sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    memset((void *) transfer_block, 0, sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     p_last_set_archived = (int *) transfer_block;
     p_archival_threads_running = (int *) (transfer_block + 4);
     p_next_set_to_archive = (int *) (transfer_block + 8);
     p_list_of_fileset_flags = (char *) (transfer_block + 12);
-    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET),
-           (void *) bkpinfo, sizeof(struct s_bkpinfo));
+    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET), (void *) bkpinfo, sizeof(struct s_bkpinfo));
     pvp = &vp;
     vp = (void *) result_str;
@@ -1310 +1309 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       get_last_filelist_number() + 1);
+                       (long)get_last_filelist_number() + 1L);
 
     log_msg(5, "We're gonna party like it's your birthday.");

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

@@ -2257 +2257 @@
 char *where_is_root_mounted() {
     /*@ buffers **************** */
-    char *output;
+    char *output = NULL;
 
 

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

@@ -8 +8 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -39 +40 @@
     char *result = NULL;
     char *tmpf = NULL;
+    char *newcall = NULL;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
-    FILE *fin;
+    FILE *fin = NULL;
 
     /*@******************************************************************** */
@@ -47 +50 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
 
-    mr_asprintf(tmpf, "%s/cpgll.out", bkpinfo->scratchdir);
-    mr_strcat(call, " > %s", tmpf);
-    log_msg(4, "Calling command: %s", call);
+    mr_asprintf(tmpf, "%s/cpgll.out", bkpinfo->tmpdir);
+    mr_asprintf(newcall, "%s > %s", call, tmpf);
+    log_msg(4, "Calling command: %s", newcall);
     /* By default return an empty string in any case */
     mr_asprintf(result, "");
 
-    system(call);
-    if ((fin = fopen(ftmp, "r"))) {
+    system(newcall);
+    mr_free(newcall);
+
+    if ((fin = fopen(tmpf, "r"))) {
         while (!feof(fin)) {
-            mr_getline(result, fin);
-            log_msg(9, "Loop result: %s", result);
-        }
-        log_msg(4, "Final Result: %s", result);
+            mr_getline(tmp, fin);
+            mr_chomp(tmp);
+            /* In case of extreme debug ;-)
+            log_msg(9, "Loop result: ***%s***", tmp);
+            */
+            /*  There is empty contant at the end of the file that needs to be skiped */
+            if (strlen(tmp) > 0) {
+                mr_free(result);
+                mr_asprintf(result, "%s", tmp);
+            }
+            mr_free(tmp);
+        }
+        log_msg(4, "Result: %s", result);
         mr_strip_spaces(result);
         paranoid_pclose(fin);
     } else {
-        log_OS_error("Unable to popen call");
-    }
-    mr_free(ftmp)
-    log_msg(4, "Returns: %s", result);
+        log_OS_error("Unable to open resulting file");
+    }
+    mr_free(tmpf);
     return(result);
 }

branches/2.2.10/mondo/src/common/libmondo-tools-EXT.h

@@ -3 +3 @@
 extern void clean_up_KDE_desktop_if_necessary(void);
 extern long get_time();
-extern char *mr_date(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,

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

@@ -803 +803 @@
     bkpinfo = (struct s_bkpinfo *)mr_malloc(sizeof(struct s_bkpinfo));
 
+    /*  We need tmpdir as early as possible for further function calls */
+    bkpinfo->tmpdir = NULL;         // Really setup after
+    setup_tmpdir(NULL);
+
     /* Initialized in same order as in the structure declaration to detect errors more easily */
     bkpinfo->media_device = NULL;
@@ -822 +826 @@
     bkpinfo->use_star = FALSE;
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-    bkpinfo->disaster_recovery = (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
+    bkpinfo->disaster_recovery = am_I_in_disaster_recovery_mode();
     if (bkpinfo->disaster_recovery) {
         mr_asprintf(bkpinfo->isodir, "%s", "/");
@@ -829 +833 @@
     }
     mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
+    /*   bkpinfo->tmpdir is here in the struct */
     bkpinfo->scratchdir = NULL;     // Really setup after
-    bkpinfo->tmpdir = NULL;         // Really setup after
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
@@ -857 +861 @@
     bkpinfo->restore_mode = interactive;
 
-    setup_tmpdir(NULL);
     sensibly_set_scratchdir();
 }
@@ -1364 +1367 @@
         va_end(args);
 
-        // do not slow down the progran if standard debug level
-        // must be enabled: if no flush, the log won't be up-to-date if there
-        // is a segfault
-        //if (g_dwDebugLevel != 1)
-
         fprintf(fout, "\n");
         paranoid_fclose(fout);

branches/2.2.10/mondo/src/common/libmondo-tools.h

@@ -6 +6 @@
 
 long get_time();
-char *mr_date(void);
 extern void (*log_debug_msg) (int debug_level, const char *szFile,
                               const char *szFunction, int nLine,

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

@@ -96 +96 @@
     extern int g_current_media_number;
     pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
-    long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
+    long g_maximum_progress = 999L; ///< The maximum amount of progress (100%) for the currently opened progress form.
     long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
     long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
@@ -644 +644 @@
             g_blurb3 = newtLabel(2, 4, blurb2);
             newtCenteredWindow(60, 11, title);
-            g_scale = newtScale(3, 6, 54, g_maximum_progress);
+            g_scale = newtScale(3, 6, 54, (long long)g_maximum_progress);
             g_progressForm = newtForm(NULL, NULL, 0);
             g_percentline = newtLabel(10, 9, "This is the percentline");