Changeset 1259 in MondoRescue

Timestamp:

Mar 21, 2007, 11:14:14 PM (18 years ago)

Author:

Bruno Cornec

Message:

• More precision for an opendir error message
• some sprintf replaced with mr_asprintf

File:

• branches/stable/mondo/src/common/libmondo-filelist.c (modified) (7 diffs)

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

@@ -1288 +1288 @@
     struct stat statbuf;
     char new[MAX_STR_LEN];
-    char *tmp = NULL;
     char *sth_B = NULL;
     static int percentage = 0;
@@ -1309 +1308 @@
     time_t this_time;
 
-    malloc_string(tmp);
     malloc_string(sth_B);
     malloc_string(ith_B);
@@ -1346 +1344 @@
         system(strtmp);
         mr_free(strtmp);
-        sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        mr_asprintf(&strtmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =
-            1 + atol(call_program_and_get_last_line_of_output(tmp));
+            1 + atol(call_program_and_get_last_line_of_output(strtmp));
+        mr_free(strtmp);
         sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
@@ -1375 +1374 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    sprintf(tmp, "Reading %-68s", dir);
-                    newtDrawRootText(0, g_noof_rows - 3, tmp);
+                    mr_asprintf(&strtmp, "Reading %-68s", dir);
+                    newtDrawRootText(0, g_noof_rows - 3, strtmp);
+                    mr_free(strtmp);
                 }
 #endif
@@ -1395 +1395 @@
     sprintf(new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        log_OS_error("opendir");
+        mr_asprintf(&strtmp, "opendir %s", dir);
+        log_OS_error(strtmp);
+        mr_free(strtmp);
     } else if (strstr(skip_these, new_with_spaces)) {
         fprintf(fout, "%s\n", dir); // if excluded dir then print dir ONLY
@@ -1426 +1428 @@
                                 counter = 0;
                                 uberctr++;
-                                sprintf(tmp, " %c ",
+                                mr_asprintf(&strtmp, " %c ",
                                         special_dot_char(uberctr));
 #ifndef _XWIN
                                 if (!g_text_mode) {
                                     newtDrawRootText(77, g_noof_rows - 3,
-                                                     tmp);
+                                                     strtmp);
+                                    mr_free(strtmp);
                                     newtRefresh();
                                 }
@@ -1455 +1458 @@
         mr_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
-    mr_free(tmp);
     mr_free(sth_B);
     mr_free(ith_B);