Changeset 1107 in MondoRescue for branches/stable/mondo/src/common/libmondo-filelist.c

Timestamp:

Feb 8, 2007, 12:09:34 AM (13 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg for common files

File:

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

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

@@ -165 +165 @@
     int retval = 0;
 
-    log_msg(1, "Sorting file %s", orig_fname);
+    mr_msg(1, "Sorting file %s", orig_fname);
     malloc_string(tmp_fname);
     malloc_string(command);
@@ -179 +179 @@
     retval = system(command);
     if (retval) {
-        log_msg(2, "Failed to sort %s - oh dear", orig_fname);
+        mr_msg(2, "Failed to sort %s - oh dear", orig_fname);
     } else {
-        log_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
+        mr_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
                 orig_fname, tmp_fname, orig_fname);
         sprintf(command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 2);
         if (retval) {
-            log_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
+            mr_msg(2, "Failed to copy %s back to %s - oh dear", tmp_fname,
                     orig_fname);
         } else {
-            log_msg(2, "%s was sorted OK.", orig_fname);
+            mr_msg(2, "%s was sorted OK.", orig_fname);
         }
     }
     mr_free(tmp_fname);
     mr_free(command);
-    log_msg(1, "Finished sorting file %s", orig_fname);
+    mr_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
 }
@@ -289 +289 @@
         if (i > MAX_STR_LEN - 1) {
             incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
+            mr_msg(1, "Warning - truncating file %s's name", incoming);
             err++;
         }
@@ -350 +350 @@
         sprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -435 +435 @@
     pattr = popen(sys_call, "r");
     if (!pattr) {
-        log_msg(1, "Failed to open fattr() %s", sys_call);
+        mr_msg(1, "Failed to open fattr() %s", sys_call);
         return (1);
     }
     if (feof(pattr)) {
-        log_msg(1, "Failed to call fattr() %s", sys_call);
+        mr_msg(1, "Failed to call fattr() %s", sys_call);
         paranoid_pclose(pattr);
         return (2);
@@ -467 +467 @@
 
     if (!(fin = fopen(filelist, "r"))) {
-        log_msg(1, "Cannot openin filelist %s", filelist);
+        mr_msg(1, "Cannot openin filelist %s", filelist);
         return (1);
     }
@@ -473 +473 @@
     sprintf(pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
-        log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
+        mr_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
         fclose(fin);
         mr_free(pout_command);
@@ -485 +485 @@
             file_to_analyze[i - 1] = '\0';
         }
-        log_msg(8, "Analyzing %s", file_to_analyze);
+        mr_msg(8, "Analyzing %s", file_to_analyze);
         asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         asprintf(&sys_call, "%s 2>> /dev/null", strtmp);    // " MONDO_LOGFILE);
@@ -552 +552 @@
 
     malloc_string(command);
-    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
+    mr_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
             original_exat_fname, executable);
     if (!orig_msklist || !orig_msklist[0]
         || !does_file_exist(orig_msklist)) {
-        log_msg(1,
+        mr_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
         sprintf(command, "gzip -dc %s | %s --restore - 2>> %s",
                 original_exat_fname, executable, MONDO_LOGFILE);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         retval = system(command);
         mr_free(command);
-        log_msg(1, "Returning w/ retval=%d", retval);
+        mr_msg(1, "Returning w/ retval=%d", retval);
         return (retval);
     }
     if (length_of_file(original_exat_fname) <= 0) {
-        log_msg(1,
+        mr_msg(1,
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
@@ -589 +589 @@
             MONDO_LOGFILE);
 
-    log_msg(1, "syscall_pin = %s", syscall_pin);
-    log_msg(1, "syscall_pout = %s", syscall_pout);
+    mr_msg(1, "syscall_pin = %s", syscall_pin);
+    mr_msg(1, "syscall_pout = %s", syscall_pout);
     pout = popen(syscall_pout, "w");
     if (!pout) {
@@ -638 +638 @@
 
         i = strcmp(p, q);
-        log_msg(my_depth, "'%s' v '%s' --> %d\n", p, q, i);
+        mr_msg(my_depth, "'%s' v '%s' --> %d\n", p, q, i);
 
 //      printf("%s v %s --> %d\n", p, q, i);
 
         if (i < 0) {            // read another subset file in.
-            log_msg(my_depth, "Reading next subset line in\n\n");
+            mr_msg(my_depth, "Reading next subset line in\n\n");
             fgets(current_subset_file, MAX_STR_LEN, faclin);
             continue;
@@ -653 +653 @@
         fgets(incoming, MAX_STR_LEN, pin);
         if (!i) {
-            log_msg(my_depth, "Copying master %s", q);
+            mr_msg(my_depth, "Copying master %s", q);
         }
 //      if (!i) { printf("Match --- %s\n", q); }
@@ -696 +696 @@
         return (set_EXAT_list(masklist, fattr_fname, "setfattr"));
     } else {
-        log_msg(1, "ERROR: set_EXAT_list: setfattr doesn't exist");
+        mr_msg(1, "ERROR: set_EXAT_list: setfattr doesn't exist");
         return(0);
     }
@@ -708 +708 @@
         return (set_EXAT_list(masklist, acl_fname, "setfacl"));
     } else {
-        log_msg(1, "ERROR: set_EXAT_list: setfacl doesn't exist");
+        mr_msg(1, "ERROR: set_EXAT_list: setfacl doesn't exist");
         return(0);
     }
@@ -786 +786 @@
     char_to_add = string_to_add[0];
     if (node->right != NULL && node->ch < char_to_add) {
-        log_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
+        mr_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
                 char_to_add, node->ch, (node->right)->ch);
         return (add_string_at_node(node->right, string_to_add));
@@ -793 +793 @@
 /* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_add) {
-        log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
+        mr_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
         depth++;
         res = add_string_at_node(node->down, string_to_add + 1);
@@ -801 +801 @@
 
     if (char_to_add == '\0' && node->ch == '\0') {
-        log_msg(6, "%s already in tree", original_string);
+        mr_msg(6, "%s already in tree", original_string);
         return (1);
     }
@@ -809 +809 @@
     if (char_to_add < node->ch) // add to the left of node
     {
-        log_msg(7, "depth=%d char=%c --- adding (left)", depth,
+        mr_msg(7, "depth=%d char=%c --- adding (left)", depth,
                 char_to_add);
         memcpy((void *) newnode, (void *) node, sizeof(struct s_node));
@@ -815 +815 @@
     } else if (char_to_add > node->ch)  // add to the right of node
     {
-        log_msg(7, "depth=%d char=%c --- adding (right)", depth,
+        mr_msg(7, "depth=%d char=%c --- adding (right)", depth,
                 char_to_add);
         newnode->right = node->right;   // newnode is to the RIGHT of node
@@ -826 +826 @@
     node->expanded = node->selected = FALSE;
     if (char_to_add == '\0') {
-        log_msg(6, "Added %s OK", original_string);
+        mr_msg(6, "Added %s OK", original_string);
         return (0);
     }
 // add the rest
-    log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
+    mr_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
         node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
         node = node->down;
         char_to_add = string_to_add[i];
-        log_msg(6, "Adding '%c'", char_to_add);
+        mr_msg(6, "Adding '%c'", char_to_add);
         node->ch = char_to_add;
         node->right = node->down = NULL;
@@ -843 +843 @@
         }
     }
-    log_msg(6, "Finally - added %s OK", original_string);
+    mr_msg(6, "Finally - added %s OK", original_string);
     return (0);
 }
@@ -886 +886 @@
     sprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
     sprintf(tmp, "zcat %s | wc -l", filelist_fname);
-    log_msg(6, "tmp = %s", tmp);
+    mr_msg(6, "tmp = %s", tmp);
     lines_in_filelist =
         atol(call_program_and_get_last_line_of_output(tmp));
@@ -949 +949 @@
 
     if (depth == 0) {
-        log_msg(0, "----------------show filelist--------------");
+        mr_msg(0, "----------------show filelist--------------");
     }
     current_string[depth] = node->ch;
 
-    log_msg(3, "depth=%d", depth);
+    mr_msg(3, "depth=%d", depth);
     if (node->down) {
-        log_msg(3, "moving down");
+        mr_msg(3, "moving down");
         depth++;
         show_filelist(node->down);
@@ -962 +962 @@
 
     if (!node->ch) {
-        log_msg(0, "%s\n", current_string);
+        mr_msg(0, "%s\n", current_string);
     }
 
     if (node->right) {
-        log_msg(3, "moving right");
+        mr_msg(3, "moving right");
         show_filelist(node->right);
     }
     if (depth == 0) {
-        log_msg(0, "----------------show filelist--------------");
+        mr_msg(0, "----------------show filelist--------------");
     }
     return;
@@ -1031 +1031 @@
     for (node = filelist; node != NULL; node = node->right) {
         str[depth] = node->ch;
-        log_msg(5, "depth=%d ch=%c", depth, node->ch);
+        mr_msg(5, "depth=%d ch=%c", depth, node->ch);
         if (!node->ch) {
 //    if (node->selected)
@@ -1403 +1403 @@
 #endif
         mr_free(find_excludes);
-        log_msg(5, "find command = %s", strtmp);
+        mr_msg(5, "find command = %s", strtmp);
         system(strtmp);
         mr_free(strtmp);
@@ -1413 +1413 @@
         find_skeleton_marker[0] = '\0';
         skeleton_lino = 1;
-        log_msg(5, "entries = %ld", g_skeleton_entries);
+        mr_msg(5, "entries = %ld", g_skeleton_entries);
         percentage = 0;
     } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
@@ -1420 +1420 @@
                 "grep -Fv \"%s\" %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_skeleton_filelist);
-//    log_msg(0, "fsm = %s", find_skeleton_marker);
+//    mr_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-//        log_msg(5, "Found %s", dir);
-//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
+//        mr_msg(5, "Found %s", dir);
+//        mr_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
             sprintf(find_skeleton_marker, "mv -f %s.new %s",
                     g_skeleton_filelist, g_skeleton_filelist);
-//        log_msg(6, "fsm = %s", find_skeleton_marker);
+//        mr_msg(6, "fsm = %s", find_skeleton_marker);
             run_program_and_log_output(find_skeleton_marker, 8);
             time(&this_time);
@@ -1446 +1446 @@
     depth++;
 
-//  log_msg(0, "Cataloguing %s", dir);
+//  mr_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
         skip_these = sth;
@@ -1513 +1513 @@
         mr_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
-        log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
+        mr_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
     mr_free(tmp);
@@ -1584 +1584 @@
     malloc_string(g_skeleton_filelist);
     exclude_paths = mr_malloc(1000);
-    log_msg(3, "Trying to write test string to exclude_paths");
+    mr_msg(3, "Trying to write test string to exclude_paths");
     strcpy(exclude_paths, "/blah /froo");
-    log_msg(3, "...Success!");
+    mr_msg(3, "...Success!");
     sprintf(sz_datefile, sz_datefile_wildcard, 0);
     if (!include_paths && !userdef_filelist) {
@@ -1613 +1613 @@
                                   ("date +%s"));
     } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2,
+        mr_msg(2,
                 "Warning - unable to find date of previous backup. Full backup instead.");
         differential = 0;
@@ -1619 +1619 @@
     } else {
         time_of_last_full_backup = statbuf.st_mtime;
-        log_msg(2, "Differential backup. Yay.");
+        mr_msg(2, "Differential backup. Yay.");
     }
 
 // use user-specified filelist (if specified)
     if (userdef_filelist) {
-        log_msg(1,
+        mr_msg(1,
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
@@ -1632 +1632 @@
         }
     } else {
-        log_msg(2, "include_paths = '%s'", include_paths);
-        log_msg(1, "Calculating filelist");
+        mr_msg(2, "include_paths = '%s'", include_paths);
+        mr_msg(1, "Calculating filelist");
         sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
 /proc /sys /tmp /root/images/mondo /var/cache/mindi ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
 
-        log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2,
+        mr_msg(2, "Excluding paths = '%s'", exclude_paths);
+        mr_msg(2,
                 "Generating skeleton filelist so that we can track our progress");
         sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_skeleton_filelist);
-        log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
-        log_msg(2, "Opening out filelist to %s", sz_filelist);
+        mr_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
+        mr_msg(2, "Opening out filelist to %s", sz_filelist);
         if (!(fout = fopen(sz_filelist, "w"))) {
             fatal_error("Cannot openout to sz_filelist");
@@ -1650 +1650 @@
         i = 0;
         if (strlen(include_paths) == 0) {
-            log_msg(1, "Including only '/' in %s", sz_filelist);
+            mr_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
                               time_of_last_full_backup);
@@ -1657 +1657 @@
             while (*p) {
                 q = next_entry(p);
-                log_msg(1, "Including %s in filelist %s", q, sz_filelist);
+                mr_msg(1, "Including %s in filelist %s", q, sz_filelist);
                 open_and_list_dir(q, exclude_paths, fout,
                                   time_of_last_full_backup);
@@ -1668 +1668 @@
         paranoid_fclose(fout);
     }
-    log_msg(2, "Copying new filelist to scratchdir");
+    mr_msg(2, "Copying new filelist to scratchdir");
     sprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
@@ -1675 +1675 @@
     sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
-    log_msg(2, "Freeing variables");
+    mr_msg(2, "Freeing variables");
     mr_free(sz_filelist);
     mr_free(command);
@@ -1681 +1681 @@
     mr_free(tmp);
     mr_free(g_skeleton_filelist);
-    log_msg(2, "Exiting");
+    mr_msg(2, "Exiting");
     return (0);
 }
@@ -1720 +1720 @@
     noof_chars = strlen(string_to_find) + 1;    /* we include the '\0' */
 
-    log_msg(7, "starting --- str=%s", string_to_find);
+    mr_msg(7, "starting --- str=%s", string_to_find);
 
 /* walk across tree if necessary */
@@ -1726 +1726 @@
     char_to_find = string_to_find[0];
     if (node->right != NULL && node->ch < char_to_find) {
-        log_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
+        mr_msg(7, "depth=%d --- going RIGHT ... %c-->%c", depth,
                 char_to_find, node->ch, (node->right)->ch);
         return (find_string_at_node(node->right, string_to_find));
@@ -1733 +1733 @@
 /* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_find) {
-        log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_find);
+        mr_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_find);
         depth++;
         node = find_string_at_node(node->down, string_to_find + 1);
@@ -1741 +1741 @@
 
     if (char_to_find == '\0' && node->ch == '\0') {
-        log_msg(7, "%s is in tree", original_string);
+        mr_msg(7, "%s is in tree", original_string);
         return (node);
     } else {
-        log_msg(7, "%s is NOT in tree", original_string);
+        mr_msg(7, "%s is NOT in tree", original_string);
         return (NULL);
     }
@@ -1772 +1772 @@
     size_t len = 0;             // Scrub's patch doesn't work without that
 
-//  log_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
+//  mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
     malloc_string(fname);
     malloc_string(tmp);
-    log_msg(5, "starting");
-    log_msg(5, "needles_list_fname = %s", needles_list_fname);
-    log_msg(5, "matches_list_fname = %s", matches_list_fname);
+    mr_msg(5, "starting");
+    mr_msg(5, "needles_list_fname = %s", needles_list_fname);
+    mr_msg(5, "matches_list_fname = %s", matches_list_fname);
     if (!(fin = fopen(needles_list_fname, "r"))) {
         fatal_error("Cannot openin needles_list_fname");
@@ -1808 +1808 @@
 */
 
-        log_msg(5, "Looking for '%s'", fname);
+        mr_msg(5, "Looking for '%s'", fname);
         found_node = find_string_at_node(filelist, fname);
         if (found_node) {
@@ -1817 +1817 @@
                     strcpy(fname, tmp);
                 }
-                log_msg(5, "Found '%s'", fname);
+                mr_msg(5, "Found '%s'", fname);
                 turn_wildcard_chars_into_literal_chars(tmp, fname);
                 fprintf(fout, "%s\n", tmp);
@@ -1852 +1852 @@
 
     malloc_string(tmp);
-    log_msg(3, "Adding %s to filelist", list_of_files_fname);
+    mr_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
         iamhere(list_of_files_fname);
@@ -1866 +1866 @@
             tmp[strlen(tmp) - 1] = '\0';
         }
-        log_msg(2, "tmp = '%s'", tmp);
+        mr_msg(2, "tmp = '%s'", tmp);
         if (!tmp[0]) {
             continue;
         }
         if ((nod = find_string_at_node(filelist, tmp))) {
-            log_msg(5, "Found '%s' in filelist already. Cool.", tmp);
+            mr_msg(5, "Found '%s' in filelist already. Cool.", tmp);
         } else {
             add_string_at_node(filelist, tmp);
@@ -1879 +1879 @@
         if (nod && flag_em) {
             toggle_path_selection(filelist, tmp, TRUE);
-            log_msg(5, "Flagged '%s'", tmp);
+            mr_msg(5, "Flagged '%s'", tmp);
         }
     }