Changeset 3892 in MondoRescue for branches/3.3/mondo/src/common/newt-specific.c

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

File:

• branches/3.3/mondo/src/common/newt-specific.c (modified) (6 diffs)

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