Changeset 2421 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

Sep 24, 2009, 3:50:38 PM (15 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

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (5 diffs)

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);