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

Timestamp:

Mar 12, 2024, 3:10:24 AM (2 years 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/mondorestore

Files:

• mondo-prep.c (modified) (5 diffs)
• mondo-rstr-newt.c (modified) (7 diffs)
• mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (6 diffs)
• mondorestore.c (modified) (8 diffs)

branches/3.3/mondo/src/mondorestore/mondo-prep.c

@@ -1026 +1026 @@
     }
 #else
-    fin = fopen("/proc/mdstat", "r");
+    fin = fopen(MDSTAT_FILE, "r");
     if (!fin) {
-        log_OS_error("/proc/mdstat");
+        log_OS_error(MDSTAT_FILE);
         paranoid_free(incoming);
         return (1);
@@ -1127 +1127 @@
 log_msg(1, "Creating LVMs");
 if (does_file_exist("/tmp/i-want-my-lvm")) {
-    wait_until_software_raids_are_prepped("/proc/mdstat", 100);
+    wait_until_software_raids_are_prepped(100);
     log_to_screen("Configuring LVM");
     if (!g_text_mode) {
@@ -1899 +1899 @@
 log_it("Partitioning drive %s", drivename);
 
-#if __FreeBSD__
+#ifdef __FreeBSD__
     log_it("(Not opening fdisk now; that's the Linux guy's job)");
     pout_to_fdisk = NULL;
@@ -1920 +1920 @@
     if (lino < 0) {
         // device not found in mountlist
-#if __FreeBSD__
+#ifdef __FreeBSD__
             // If this is the first partition (just as a sentinel value),
             // then see if the user has picked 'dangerously-dedicated' mode.
@@ -1986 +1986 @@
 
         log_it("Wiping %s's partition table", drivename);
-#if __FreeBSD__
+#ifdef __FreeBSD__
             // FreeBSD doesn't let you write to blk devices in <512byte chunks.
             file = open(drivename, O_WRONLY);

branches/3.3/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -615 +615 @@
  * @ingroup restoreGuiMountlist
  */
-void
-choose_raid_level(struct OSSWAP (raid_device_record, vinum_plex) * raidrec)
-{
+void choose_raid_level(struct OSSWAP (raid_device_record, vinum_plex) * raidrec) {
 
 #ifdef __FreeBSD__
 
     /** int ***************************************************************/
-    int res = 0;
     int out = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *prompt = NULL;
-    char sz[MAX_STR_LEN];
+    char *sz = NULL;
 
     mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        strcpy(tmp, "concat");
+        mr_asprintf(tmp, "%s", "concat");
     } else if (raidrec->raidlevel == 0) {
-        strcpy(tmp, "striped");
+        mr_asprintf(tmp, "%s", "striped");
     } else {
-        sprintf(tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
-        if (!res) {
+        tmp1 = mr_popup_and_get_string("Specify RAID level", prompt, tmp);
+        if (tmp1 == NULL) {
             mr_free(prompt);
+            mr_free(tmp);
             return;
         }
-        strip_spaces(tmp);
+        mr_free(tmp);
+        tmp = mr_strip_spaces(tmp1);
+        log_it(tmp);
+
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
-            strncpy(tmp, sz + 1, strlen(sz) - 2);
+            sz = tmp;
+            // safe as shorter
+            mr_strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
         }
@@ -657 +660 @@
             out = 5;
         }
-        log_it(tmp);
+        mr_free(tmp);
+
         if (is_this_raid_personality_registered(out)) {
             log_it("Groovy. You've picked a RAID personality which is registered.");
@@ -664 +668 @@
             {
                 out = 999;
+                if (raidrec->raid_level == -1) {
+                    mr_asprintf(tmp, "%s", "linear");
+                } else {
+                    mr_asprintf(tmp, "%d", raidrec->raid_level);
+                }
             }
         }
     }
     mr_free(prompt);
+    mr_free(tmp);
 
     raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *personalities = NULL;
     char *prompt = NULL;
-    char sz[MAX_STR_LEN];
+    char *sz;
     int out = 0;
-    int res = 0;
 
 
     assert(raidrec != NULL);
-    paranoid_system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
+    paranoid_system("grep Pers " MDSTAT_FILE " > /tmp/raid-personalities.txt 2> /dev/null");
     mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
@@ -687 +697 @@
 
     if (raidrec->raid_level == -1) {
-        strcpy(tmp, "linear");
+        mr_asprintf(tmp, "%s", "linear");
     } else {
-        sprintf(tmp, "%d", raidrec->raid_level);
+        mr_asprintf(tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
          out != -1 && out != 0 && out != 1 && out != 4 && out != 5
          && out != 10;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
-        if (!res) {
+        tmp1 = mr_popup_and_get_string("Specify RAID level", prompt, tmp);
+        if (tmp1 == NULL) {
+            mr_free(tmp);
+            mr_free(prompt);
             return;
         }
-        strip_spaces(tmp);
+        mr_free(tmp);
+        tmp = mr_strip_spaces(tmp1);
+        log_it(tmp);
+
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            strcpy(sz, tmp);
-            strncpy(tmp, sz + 1, strlen(sz) - 2);
+            sz = tmp;
+            // safe as shorter
+            mr_strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
         }
@@ -711 +727 @@
             out = atoi(tmp);
         }
-        log_it(tmp);
+        mr_free(tmp);
+
         if (is_this_raid_personality_registered(out)) {
             log_it("Groovy. You've picked a RAID personality which is registered.");
@@ -717 +734 @@
             if (ask_me_yes_or_no("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")) {
                 out = 999;
+                mr_free(tmp);
+                if (raidrec->raid_level == -1) {
+                    mr_asprintf(tmp, "%s", "linear");
+                } else {
+                    mr_asprintf(tmp, "%d", raidrec->raid_level);
+                }
             }
         }
     }
     mr_free(prompt);
+    mr_free(tmp);
 
     raidrec->raid_level = out;
@@ -2483 +2507 @@
 
 
-#if __FreeBSD__
+#ifdef __FreeBSD__
 /**
  * Add a subdisk to @p raidrec.

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -29 +29 @@
 extern void ask_about_these_imagedevs(char *infname, char *outfname);
 
-extern void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                                  int wait_for_percentage);
+extern void wait_until_software_raids_are_prepped(int wait_for_percentage);

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -22 +22 @@
 // no include for now in mondo-rstr-newt.c
 extern int edit_filelist(struct s_node *);
+
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -90 +92 @@
 extern char *MONDO_LOGFILE;
 
-/* Reference to global bkpinfo */
-extern struct s_bkpinfo *bkpinfo;
-
 /* Should we use or not extended attributes and acl when restoring */
 extern char *g_getfattr;
@@ -525 +524 @@
  * @return TRUE if OK was pressed, FALSE otherwise.
  */
-bool get_isodir_info(char *isodir_device, char *isodir_format,
-                struct s_bkpinfo *bkpinfo, bool nuke_me_please)
+bool get_isodir_info(char *isodir_device, char *isodir_format, bool nuke_me_please)
 {
 
@@ -610 +608 @@
 }
 
-if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo, nuke_me_please)) {
+if (!get_isodir_info(g_isodir_device, g_isodir_format, nuke_me_please)) {
     return (1);
 }
@@ -678 +676 @@
 /** malloc **/
 char *tmp = NULL;
-char *tmp1 = NULL;
 char *command = NULL;
 char *mountdir = NULL;
@@ -2258 +2255 @@
 /* @} - end restoreUtilityGroup */
 
-void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
+void wait_until_software_raids_are_prepped(int wait_for_percentage)
 {
     struct raidlist_itself *raidlist;

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -32 +32 @@
 #include "newt-specific-EXT.h"
 
-extern void wait_until_software_raids_are_prepped(char *, int);
 extern void twenty_seconds_til_yikes(void);
 // in mondo-prep.c
@@ -377 +376 @@
         case -1:
             fatal_error("Fork failure");
+            break;
         case 0:
             log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", biggiestruct.filename, ntfsprog_fifo);
@@ -1041 +1041 @@
  * @param orig_bf_fname The original filename of the biggiefile.
  * @param biggiefile_number The number of the biggiefile (starting from 0).
- * @param orig_checksum Unused.
- * @param biggiefile_size Unused.
  * @param filelist The node structure containing the list of files to be restored.
  * If @p orig_bf_fname is not in the list, it will be ignored.
  * @return 0 for success (or skip), nonzero for failure.
- * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
- */
-int restore_a_biggiefile_from_stream(char *orig_bf_fname, long biggiefile_number, char *orig_checksum,  //UNUSED
-                                     long long biggiefile_size, //UNUSED
+ */
+int restore_a_biggiefile_from_stream(char *orig_bf_fname, long biggiefile_number,
                                      struct s_node *filelist,
                                      int use_ntfsprog,
@@ -1085 +1081 @@
     assert(bkpinfo != NULL);
     assert(orig_bf_fname != NULL);
-    assert(orig_checksum != NULL);
 
     pathname_of_last_file_restored[0] = '\0';
@@ -1144 +1139 @@
         case -1:
             fatal_error("Fork failure");
+            break;
         case 0:
             log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", outfile_fname, ntfsprog_fifo);
@@ -1372 +1368 @@
         res = restore_a_biggiefile_from_stream(biggie_fname,
                                                current_bigfile_number,
-                                               biggie_cksum,
-                                               biggie_size,
                                                filelist, ctrl_chr,
                                                pathname_of_last_biggie_restored);
@@ -2730 +2724 @@
     }
 
-    if (argc == 3 && strcmp(argv[1], "--mdstat") == 0) {
-        wait_until_software_raids_are_prepped(argv[2], 100);
+    if (argc == 2 && strcmp(argv[1], "--mdstat") == 0) {
+        wait_until_software_raids_are_prepped(100);
         finish(0);
     }
@@ -2952 +2946 @@
     }
 
-/*  
-  log_to_screen("If you are REALLY in a hurry, hit Ctrl-Alt-Del now.");
-  log_to_screen("Otherwise, please wait until the RAID disks are done.");
-  wait_until_software_raids_are_prepped("/proc/mdstat", 100);
-  log_to_screen("Thank you.");
-*/
     unlink("/tmp/mondo-run-prog.tmp");
     set_signals(FALSE);