Changeset 1157 in MondoRescue

Timestamp:

Feb 13, 2007, 2:18:42 AM (18 years ago)

Author:

Bruno Cornec

Message:

2 more files merged from trunk (pass 1)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-fifo.c (modified) (2 diffs)
• libmondo-filelist.c (modified) (9 diffs)

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

@@ -159 +159 @@
 void kill_buffer()
 {
-    char *tmp;
-    char *command;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+    char *command = NULL;
+
     sync();
     if (g_sz_call_to_buffer == NULL) {
@@ -173 +172 @@
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     mr_msg(2, "kill_buffer() --- command = %s", command);
-    strcpy(tmp, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
     mr_free(command);
 

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

@@ -36 +36 @@
 
 
-extern ssize_t getline(char **lineptr, size_t * n, FILE * stream);
-
-
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
                        char *include_paths, char *excp, int differential,
@@ -227 +224 @@
     /*@ structures ********************************* */
     struct stat buf;
-    int err = 0;
-
 
     assert_string_is_neither_NULL_nor_zerolength(filelist);
@@ -253 +248 @@
     if (!(fbig = fopen(biggie_fname, "w"))) {
         log_OS_error("Cannot openout biggie_fname");
-        err++;
-        goto end_of_func;
+        return (0);
     }
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Cannot openout outfname");
-        err++;
-        goto end_of_func;
+        return (0);
     }
     mr_getline(&incoming, &n, fin);
@@ -296 +289 @@
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
-                    err++;
-                    goto end_of_func;
+                    return (0);
                 }
                 update_evalcall_form((int) (lino * 100 / noof_lines));
@@ -323 +315 @@
         log_OS_error
             ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
-        err = 1;
+        return (0);
     }
     mr_free(outfname);
@@ -340 +332 @@
        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);
@@ -347 +338 @@
         newtPopWindow();
     }
-#endif
-  end_of_func:
-    return (err ? 0 : curr_set_no + 1);
+    return (curr_set_no + 1);
 }
 
@@ -1333 +1322 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        asprintf(&find_excludes, " ");
+        mr_asprintf(&find_excludes, " ");
         while((token = mr_strtok (sth, delims, &lastpos))) {
-          asprintf(&strtmp,"%s", find_excludes);
+          mr_asprintf(&strtmp,"%s", find_excludes);
           mr_free(find_excludes);
-          asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
           mr_free(strtmp);
           mr_free(token);
@@ -1343 +1332 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o %s -type d -print > %s 2> /dev/null",
              dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
                 dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);