Changeset 127 in MondoRescue for trunk/mondo/mondo/common/libmondo-filelist.c

Timestamp:

Nov 19, 2005, 2:27:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r 125:126 $SVN_M/branches/2.05

File:

• trunk/mondo/mondo/common/libmondo-filelist.c (modified) (25 diffs)

trunk/mondo/mondo/common/libmondo-filelist.c

@@ -158 +158 @@
     log_msg(1, "Sorting file %s", orig_fname);
     asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
-            (int) (random() % 32768), (int) (random() % 32768));
+             (int) (random() % 32768), (int) (random() % 32768));
 
     if (!does_file_exist(orig_fname)) {
@@ -165 +165 @@
 
     asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
-            MONDO_LOGFILE);
+             MONDO_LOGFILE);
     retval = system(command);
     paranoid_free(command);
@@ -254 +254 @@
     if (!(fbig = fopen(biggie_fname, "w"))) {
         log_OS_error("Cannot openout biggie_fname");
-        return(0);
+        return (0);
     }
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Cannot openout outfname");
-        return(0);
+        return (0);
     }
     (void) fgets(&incoming, &n, fin);
@@ -268 +268 @@
         }
         /* BERLIOS: Useless with getline
-        if (i > MAX_STR_LEN - 1) {
-            incoming[MAX_STR_LEN - 30] = '\0';
-            log_msg(1, "Warning - truncating file %s's name", incoming);
-            err++;
-        }
-        */
+           if (i > MAX_STR_LEN - 1) {
+           incoming[MAX_STR_LEN - 30] = '\0';
+           log_msg(1, "Warning - truncating file %s's name", incoming);
+           err++;
+           }
+         */
         if (incoming[i] < 32) {
             incoming[i] = '\0';
@@ -298 +298 @@
                 curr_set_no++;
                 curr_set_size = 0;
-                asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+                asprintf(&outfname, "%s/filelist.%ld", outdir,
+                         curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
-                    return(0);
+                    return (0);
                 }
                 update_evalcall_form((int) (lino * 100 / noof_lines));
@@ -327 +328 @@
         log_OS_error
             ("Unable to echo write one-liner to LAST-FILELIST-NUMBER");
-        return(0);
+        return (0);
     }
     paranoid_free(outfname);
@@ -423 +424 @@
         return (2);
     }
-    for (getline(&tmp, &n, pattr); !feof(pattr);
-         getline(&tmp, &n, pattr)) {
+    for (getline(&tmp, &n, pattr); !feof(pattr); getline(&tmp, &n, pattr)) {
         fputs(tmp, pout);
     }
@@ -490 +490 @@
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
         asprintf(&command,
-                "cat %s | getfacl --all-effective -P - 2>> %s | gzip -c1 > %s 2>> %s",
-                filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
+                 "cat %s | getfacl --all-effective -P - 2>> %s | gzip -c1 > %s 2>> %s",
+                 filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         iamhere(command);
         retval = system(command);
@@ -544 +544 @@
 {
     const int my_depth = 8;
-    char *command, *syscall_pin, *syscall_pout; 
+    char *command, *syscall_pin, *syscall_pout;
     char *incoming = NULL;
-    char *current_subset_file = NULL; 
+    char *current_subset_file = NULL;
     char *current_master_file, *masklist;
     int retval = 0;
@@ -561 +561 @@
                 "No masklist provided. I shall therefore set ALL attributes.");
         asprintf(&command, "cat %s | gzip -dc | %s --restore - 2>> %s",
-                original_exat_fname, executable, MONDO_LOGFILE);
+                 original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
@@ -575 +575 @@
     }
     asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
-            (int) (random() % 32768));
+             (int) (random() % 32768));
     asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
@@ -583 +583 @@
     asprintf(&syscall_pin, "cat %s | gzip -dc", original_exat_fname);
     asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
-            MONDO_LOGFILE);
+             MONDO_LOGFILE);
 
     log_msg(1, "syscall_pin = %s", syscall_pin);
@@ -774 +774 @@
         return (add_string_at_node(node->right, string_to_add));
     }
-
     // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
@@ -788 +787 @@
         return (1);
     }
-
     // add here
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
@@ -904 +902 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for (getline(&fname, &n, pin); !feof(pin);
-         getline(&fname, &n, pin)) {
+    for (getline(&fname, &n, pin); !feof(pin); getline(&fname, &n, pin)) {
         if ((fname[strlen(fname) - 1] == 13
              || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
@@ -1326 +1323 @@
  */
 int open_and_list_dir(char *dir, char *sth, FILE * fout,
-                      time_t time_of_last_full_backup, char *skeleton_filelist) 
+                      time_t time_of_last_full_backup,
+                      char *skeleton_filelist)
 {
     DIR *dip;
@@ -1359 +1357 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&tmp,
-                "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                 "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
         asprintf(&tmp,
-                "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -type d -a -print > %s 2> /dev/null",
-                dir, MAX_SKEL_DEPTH, skeleton_filelist);
+                 "find %s -maxdepth %d -path /proc -prune -o -path /tmp -prune -o -type d -a -print > %s 2> /dev/null",
+                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
 #endif
         system(tmp);
@@ -1436 +1434 @@
             asprintf(&new_with_spaces, " %s ", new);
             /* BERLIOS: Old code
-            new_with_spaces[0] = ' ';
-            strcpy(new_with_spaces + 1, new);
-            strcat(new_with_spaces, " ");
-            */
+               new_with_spaces[0] = ' ';
+               strcpy(new_with_spaces + 1, new);
+               strcat(new_with_spaces, " ");
+             */
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1447 +1445 @@
                         && S_ISDIR(statbuf.st_mode)) {
                         open_and_list_dir(new, skip_these, fout,
-                                          time_of_last_full_backup, skeleton_filelist);
+                                          time_of_last_full_backup,
+                                          skeleton_filelist);
                     } else {
                         if (time_of_last_full_backup == 0
@@ -1457 +1456 @@
                                 uberctr++;
                                 asprintf(&tmp, " %c ",
-                                        special_dot_char(uberctr));
+                                         special_dot_char(uberctr));
 #ifndef _XWIN
                                 if (!g_text_mode) {
@@ -1547 +1546 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
-    char *skeleton_filelist; 
-    // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
+    char *skeleton_filelist;
+    // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
 
     asprintf(&sz_datefile, sz_datefile_wildcard, 0);
@@ -1565 +1564 @@
     if (differential == 0) {
         // restore last good datefile if it exists
-        asprintf(&command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
+                 sz_datefile);
         run_program_and_log_output(command, 3);
         paranoid_free(command);
@@ -1572 +1572 @@
         if (does_file_exist(sz_datefile)) {
             asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
-                    sz_datefile);
+                     sz_datefile);
             paranoid_system(command);
             paranoid_free(command);
@@ -1630 +1630 @@
                 log_msg(1, "Including %s in filelist %s", q, sz_filelist);
                 open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup, skeleton_filelist);
+                                  time_of_last_full_backup,
+                                  skeleton_filelist);
                 p += strlen(q);
                 while (*p == ' ') {
@@ -1819 +1820 @@
         return (1);
     }
-    for (getline(&tmp, &n, fin); !feof(fin);
-         getline(&tmp, &n, fin)) {
+    for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
         if (!tmp[0]) {
             continue;