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

Timestamp:

Mar 12, 2024, 3:10:24 AM (3 months ago)

Author:

Bruno Cornec

Message:

More compiler fixes

• Fix unused vars
• Fix FreeBSD #if alone
• Use MDSTAT_FILE everywhere
• Fix missing break
• Fix some strncpy. mr_strncpy used when safe
• Fix wrong g_isoform_header_str proto !
• find-cd & find-dvd => find-optical

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-archive.c (modified) (4 diffs)
• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (6 diffs)
• libmondo-filelist.c (modified) (3 diffs)
• libmondo-raid.c (modified) (1 diff)
• libmondo-stream.c (modified) (1 diff)
• libmondo-string.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)
• libmondo-verify.c (modified) (2 diffs)
• newt-specific.c (modified) (6 diffs)

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

@@ -1446 +1446 @@
  * @param ntfsprog_fifo The FIFO to ntfsclone if this is an imagedev, NULL otherwise.
  * @param biggie_file_number The sequence number of this biggie file (starting from 0).
- * @param noof_biggie_files The number of biggie files there are total.
  * @return The number of errors encountered (0 for success)
  * @see make_slices_and_images
  * @ingroup LLarchiveGroup
  */
-int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
+int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, bool use_ntfsprog) {
 
     /*@ buffers ************************************************** */
@@ -1812 +1811 @@
                 write_header_block_to_stream(biggie_fsize, bigfile_fname, use_ntfsprog ?  BLK_START_A_PIHBIGGIE : BLK_START_A_NORMBIGGIE);
             }
-            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
+            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, use_ntfsprog);
 
             /* Free it here as ntfsprog_fifo is not used anymore */
@@ -2417 +2416 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         write_header_block_to_stream((off_t)0, "start-of-afioballs", BLK_START_AFIOBALLS);
+#ifdef __FreeBSD__
 #if __FreeBSD__ == 5
         log_msg(1, "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
         res = make_afioballs_and_images_OLD();
+#endif
 #else
         res = make_afioballs_and_images_OLD();
@@ -2643 +2644 @@
     mr_asprintf(broken_bios_sz, "yes"); /* assume so */
 
-    if (pkpinfo->auto_recovery) {
+    if (bkpinfo->auto_recovery) {
         mr_asprintf(cd_recovery_sz, "yes");
     } else {

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

@@ -998 +998 @@
 void termination_in_progress(int sig)
 {
-    log_msg(1, "Termination in progress");
+    log_msg(1, "Termination in progress by signal %d",sig);
     usleep(1000);
     pthread_exit(0);

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

@@ -443 +443 @@
                 mr_free(mount_list);
 
-                mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+                mr_asprintf(command, "%s", "cat " MDSTAT_FILE " |grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                 log_msg (5, "Running: %s", command);
                 mount_list = call_program_and_get_last_line_of_output(command);
@@ -499 +499 @@
 
         /* Get the Software raid device list */
-        mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+        mr_asprintf(command, "%s", "cat " MDSTAT_FILE " | grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
         mount_list = call_program_and_get_last_line_of_output(command);
@@ -788 +788 @@
 bool does_nonMS_partition_exist(void)
 {
-#if __FreeBSD__
+#ifdef __FreeBSD__
     return
         !system("for drive in /dev/ad? /dev/da?; do fdisk $drive | grep -q FreeBSD && exit 0; done; false");
@@ -2136 +2136 @@
 
     case udev:
-        if (!ask_me_yes_or_no
-            ("This option is for advanced users only. Are you sure?")) {
+        if (!ask_me_yes_or_no("This option is for advanced users only. Are you sure?")) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
         }
+        break;
+
     case tape:
 
@@ -2483 +2484 @@
 // NTFS 
         tmp = call_program_and_get_last_line_of_output("mr-parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'");
-        strncpy(tmp1, tmp,(MAX_STR_LEN / 4)-1);
+        if (strlen(tmp) > 2) {
+            tmp1 = mr_popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp);
+            if (tmp1 == NULL) {
+                log_to_screen("User has chosen not to backup the machine");
+                mr_free(tmp);
+                mr_free(tmp1);
+                finish(1);
+            }
+            mr_free(bkpinfo->image_devs);
+            bkpinfo->image_devs = tmp1;
+        }
         mr_free(tmp);
-        if (strlen(tmp1) > 2) {
-            if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1,(MAX_STR_LEN / 4)-1)) {
-                log_to_screen("User has chosen not to backup the machine");
-                finish(1);
-            }
-            mr_asprintf(bkpinfo->image_devs, "%s", tmp1);
-        }
 
         if (bkpinfo->exclude_paths != NULL ) {
@@ -2572 +2576 @@
         mr_free(compression_type);
 
+#ifdef __FreeBSD__
 #if __FreeBSD__ == 5
         mr_asprintf(bkpinfo->kernel_path, "%s", "/boot/kernel/kernel");
 #elif __FreeBSD__ == 4
         mr_asprintf(bkpinfo->kernel_path, "%s", "/kernel");
+#endif
 #elif linux
         if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {

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

@@ -1482 +1482 @@
 /**
  * Create the filelist for the backup. It will be stored in [scratchdir]/archives/filelist.full.
- * @param logfile Unused.
  * @param tmpdir The tmpdir of the backup.
  * @param scratchdir The scratchdir of the backup.
@@ -1490 +1489 @@
  * @param userdef_filelist The user-defined filelist, or NULL if you're using @p include_paths.
  * @return 0, always.
- * @bug @p logfile is unused.
  * @bug Return value is meaningless.
  */
-int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
+int mondo_makefilelist(char *tmpdir, char *scratchdir,
                        char *include_paths, char *excp, int differential,
                        char *userdef_filelist)
@@ -1657 +1655 @@
 
     if (bkpinfo->make_filelist) {
-        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
+        res = mondo_makefilelist(bkpinfo->tmpdir, bkpinfo->scratchdir, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
-        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
+        res = mondo_makefilelist(bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 

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

@@ -56 +56 @@
         mr_strcat(command, "raid%d", raidno);
     }
-    mr_strcat(command, "\" /proc/mdstat > /dev/null 2> /dev/null");
+    mr_strcat(command, "\" " MDSTAT_FILE " > /dev/null 2> /dev/null");
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
     res = system(command);

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

@@ -317 +317 @@
 {
     int res = 0;
-    char *command = NULL;
 
     if (bkpinfo->media_device == NULL) {

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

@@ -387 +387 @@
     switch (i) {
     case 0:
-        mr_asprintf(output, "zero");
+        mr_asprintf(output, "%s", "zero");
         break;
     case 1:
-        mr_asprintf(output, "one");
+        mr_asprintf(output, "%s", "one");
         break;
     case 2:
-        mr_asprintf(output, "two");
+        mr_asprintf(output, "%s", "two");
         break;
     case 3:
-        mr_asprintf(output, "three");
+        mr_asprintf(output, "%s", "three");
         break;
     case 4:
-        mr_asprintf(output, "four");
+        mr_asprintf(output, "%s", "four");
         break;
     case 5:
-        mr_asprintf(output, "five");
+        mr_asprintf(output, "%s", "five");
         break;
     case 6:
-        mr_asprintf(output, "six");
+        mr_asprintf(output, "%s", "six");
         break;
     case 7:
-        mr_asprintf(output, "seven");
+        mr_asprintf(output, "%s", "seven");
         break;
     case 8:
-        mr_asprintf(output, "eight");
+        mr_asprintf(output, "%s", "eight");
         break;
     case 9:
-        mr_asprintf(output, "nine");
+        mr_asprintf(output, "%s", "nine");
+        break;
     case 10:
-        mr_asprintf(output, "ten");
+        mr_asprintf(output, "%s", "ten");
+        break;
     default:
         mr_asprintf(output, "%d", i);
+        break;
     }
     return (output);

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

@@ -735 +735 @@
 
     if (!run_program_and_log_output("mr-parted2fdisk -l 2>/dev/null | grep -i raid", 1) && !does_file_exist("/etc/raidtab")) {
-        log_to_screen("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
+        log_to_screen("You have RAID partitions but no /etc/raidtab - creating one from " MDSTAT_FILE);
         create_raidtab_from_mdstat(MDSTAT_FILE,"/etc/raidtab");
     }

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

@@ -345 +345 @@
  * @param bkpinfo The backup information structure. @c bkpinfo->tmpdir is the only field used.
  * @param biggie_fname The filename of the biggiefile to verify.
- * @param size The size in bytes of said biggiefile.
+ * @param size The size in bytes of said biggiefile. TODO: Removed as not used. Is it linked to slice_siz ?
  * @return 0 for success (even if the file doesn't match); nonzero for a tape error.
  */
 int
-verify_a_biggiefile_from_stream(char *biggie_fname, long long size)
+verify_a_biggiefile_from_stream(char *biggie_fname)
 {
 
@@ -609 +609 @@
         if (bkpinfo->restore_path != NULL) {
             mr_asprintf(logical_fname, "%s/%s", bkpinfo->restore_path, orig_fname);
-            res = verify_a_biggiefile_from_stream(logical_fname, size);
+            res = verify_a_biggiefile_from_stream(logical_fname);
             mr_free(logical_fname);
             retval += res;

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

@@ -79 +79 @@
     long g_isoform_starttime;   ///< The time (in seconds since the epoch) that the evalcall form was opened.
     int g_isoform_old_progress = -1;    ///< The most recent progress update of the evalcall form (percent).
-    char g_isoform_header_str = NULL;   ///< The string for the evalcall form title.
+    char *g_isoform_header_str = NULL;  ///< The string for the evalcall form title.
     int g_mysterious_dot_counter;   ///< The counter for the twirling baton (/ | \\ - ...) on percentage less than 3
     int g_noof_log_lines = 6;   ///< The number of lines to show in the log at the bottom of the screen.
@@ -602 +602 @@
 
         assert(ttl != NULL);
-        //strcpy(g_isoform_header_str, ttl);
         if (g_text_mode) {
             log_msg(0, ttl);
@@ -614 +613 @@
         g_isoform_starttime = get_time();
         if (g_text_mode) {
-            log_msg(0, g_isoform_header_str);
+            log_msg(0, "g_isoform_header_str = %s", g_isoform_header_str);
         } else {
             g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
@@ -1012 +1011 @@
         }
 
-        /* not sure it's useful to shrink here
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
-        strncpy(prompt, p, MAX_NEWT_COMMENT_LEN - 1);
-        prompt[MAX_NEWT_COMMENT_LEN - 1] = '\0';
-        text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
-        */
         text = newtTextboxReflowed(1, 1, p, 40, 5, 5, 0);
         b_1 = newtButton(20 - ((button2[0] != '\0') ? strlen(button1) + 2 : strlen(button1) / 2), newtTextboxGetNumLines(text) + 3, button1);
@@ -1528 +1521 @@
  * @param flentry The filelist entry to stringify.
  * @return The string form of @p flentry.
- * @note The returned value points to static storage that will be overwritten with each call.
+ * @note The returned value points to a dynamically allocated string that the caller needs to free.
  */
 char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
-        static char comment[100];
-        char *tmp = NULL;
+        char *comment = NULL;
 
         log_msg(8, "entering");
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            mr_asprintf(tmp, "0   ");
+            mr_asprintf(comment, "0   ");
         } else if (flentry->severity == 1) {
-            mr_asprintf(tmp, "low ");
+            mr_asprintf(comment, "low ");
         } else if (flentry->severity == 2) {
-            mr_asprintf(tmp, "med ");
-        } else {
-            mr_asprintf(tmp, "high");
-        }
-        mr_strcat(tmp, "  ");
-        mr_strcat(tmp, flentry->filename);
-        strncpy(comment, tmp, 99);
-        mr_free(tmp);
-
+            mr_asprintf(comment, "med ");
+        } else {
+            mr_asprintf(comment, "high");
+        }
+        mr_strcat(comment, "  ");
+        mr_strcat(comment, flentry->filename);
         log_it("leaving");
         return (comment);
@@ -1615 +1604 @@
         for (i = 0; i < filelist->entries; i++) {
             keylist[i] = (void *) i;
+            tmp = filelist_entry_to_string(&(filelist->el[i]));
             newtListboxAppendEntry(fileListbox,
-                                   filelist_entry_to_string(&
-                                                            (filelist->
-                                                             el[i])),
+                                    tmp,
                                    keylist[i]);
+            mr_free(tmp);
         }
         mr_asprintf(differ_sz, "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);