Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (9 diffs)

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

@@ -346 +346 @@
        then update_progress_form() won't show the "time taken / time remaining"
        line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
-#ifndef _XWIN
     if (!g_text_mode) {
         open_progress_form("", "", "", "", 100);
@@ -353 +352 @@
         newtPopWindow();
     }
-#endif
     return (err ? 0 : curr_set_no + 1);
 }
@@ -471 +469 @@
         tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
         mr_asprintf(strtmp, syscall_sprintf, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
+
         mr_asprintf(syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
         mr_free(strtmp);
+
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
@@ -927 +927 @@
         }
         add_string_at_node(filelist, fname);
-        mr_free(fname);
 
         if (!(++lino % 1111)) {
@@ -933 +932 @@
             update_evalcall_form(percentage);
         }
+        mr_free(fname);
     }
     mr_free(fname);
@@ -1414 +1414 @@
             if (this_time != last_time) {
                 last_time = this_time;
-#ifndef _XWIN
                 if (!g_text_mode) {
                     mr_asprintf(tmp, "Reading %-68s", dir);
@@ -1420 +1419 @@
                     mr_free(tmp);
                 }
-#endif
                 update_evalcall_form(percentage);
             }
@@ -1468 +1466 @@
                                 counter = 0;
                                 uberctr++;
-#ifndef _XWIN
                                 mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
                                 if (!g_text_mode) {
@@ -1475 +1472 @@
                                 }
                                 mr_free(tmp);
-#endif
                             }
                         }