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

Timestamp:

Aug 28, 2009, 2:41:30 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Replacement of some fgets by mr_getline to allow for dyn. memory management.
• Backport of SElinux fix from 2.2.9

File:

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

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

@@ -414 +414 @@
 int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
 {
-    FILE *pattr;
-    char *tmp;
+    FILE *pattr = NULL;
+    char *tmp = NULL;
+
     pattr = popen(syscall, "r");
     if (!pattr) {
@@ -426 +427 @@
         return (2);
     }
-    malloc_string(tmp);
-    for ((void)fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr);
-         (void)fgets(tmp, MAX_STR_LEN, pattr)) {
+    for (mr_getline(tmp, pattr); !feof(pattr); mr_getline(tmp, pattr)) {
         fputs(tmp, pout);
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_pclose(pattr);
-    paranoid_free(tmp);
     return (0);
 }
@@ -441 +441 @@
                  char *auxlist_fname)
 {
-    FILE *fin;
-    FILE *pout;
+    FILE *fin = NULL;
+    FILE *pout = NULL;
     char *pout_command = NULL;
-    char *syscall;
-    char *file_to_analyze;
+    char *syscall = NULL;
+    char *file_to_analyze = NULL;
     char *strtmp = NULL;
     char *tmp = NULL;
@@ -463 +463 @@
     mr_free(pout_command);
 
-    malloc_string(file_to_analyze);
-    for ((void)fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    for (mr_getline(file_to_analyze, fin); !feof(fin); mr_getline(file_to_analyze, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -478 +476 @@
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
-    }
+        mr_free(file_to_analyze);
+    }
+    mr_free(file_to_analyze);
     paranoid_fclose(fin);
     paranoid_pclose(pout);
-    paranoid_free(file_to_analyze);
     return (0);
 }
@@ -529 +528 @@
     char *syscall_pin = NULL;
     char *syscall_pout = NULL;
-    char *incoming;
-    char *current_subset_file;
+    char *incoming = NULL;
+    char *current_subset_file = NULL;
     char *current_master_file = NULL;
     char *masklist = NULL;
@@ -553 +552 @@
         return (0);
     }
-    malloc_string(incoming);
-    malloc_string(current_subset_file);
     mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
@@ -561 +558 @@
 
     sort_file(masklist);
-    current_subset_file[0] = '\0';
 
     mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
@@ -594 +590 @@
 //  printf("Hi there. Starting the loop\n");
 
-    (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
-    (void)fgets(incoming, MAX_STR_LEN, pin);
+    mr_getline(current_subset_file, faclin);
+    mr_getline(incoming, pin);
     while (!feof(pin) && !feof(faclin)) {
         mr_asprintf(current_master_file, "%s", incoming + 8);
@@ -625 +621 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+            mr_free(current_subset_file);
+            mr_getline(current_subset_file, faclin);
             continue;
         }
@@ -632 +629 @@
             fputs(incoming, pout);
         }
-        (void)fgets(incoming, MAX_STR_LEN, pin);
+        mr_free(incoming);
+        mr_getline(incoming, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
@@ -641 +639 @@
                 fputs(incoming, pout);
             }
-            (void)fgets(incoming, MAX_STR_LEN, pin);
+            mr_free(incoming);
+            mr_getline(incoming, pin);
         }
         if (!i) {
-            (void)fgets(current_subset_file, MAX_STR_LEN, faclin);
+            mr_free(current_subset_file);
+            mr_getline(current_subset_file, faclin);
         }
         mr_free(current_master_file);
     }
-    while (!feof(pin)) {
-        (void)fgets(incoming, MAX_STR_LEN, pin);
-    }
+    mr_free(current_subset_file);
+    mr_free(incoming);
     fclose(faclin);
     pclose(pin);
     pclose(pout);
 
-//  printf("OK, loop is done\n");
-
     unlink(masklist);
     mr_free(masklist);
 
-    paranoid_free(current_subset_file);
-    paranoid_free(incoming);
     return (retval);
 }
@@ -772 +767 @@
     noof_chars = strlen(string_to_add) + 1; /* we include the '\0' */
 
-/* walk across tree if necessary */
+    /* walk across tree if necessary */
     node = startnode;
     char_to_add = string_to_add[0];
@@ -781 +776 @@
     }
 
-/* walk down tree if appropriate */
+    /* 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);
@@ -795 +790 @@
     }
 
-/* add here */
+    /* add here */
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
         log_to_screen("failed to malloc");
@@ -866 +861 @@
     /*@ buffers **************************************************** */
     char *command_to_open_fname = NULL;
-    char fname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char *tmp1 = NULL;
+    char *fname = NULL;
+    char *tmp = NULL;
     int pos_in_fname;
     /*@ int ******************************************************** */
@@ -884 +878 @@
     }
     log_to_screen("Loading filelist");
-    mr_asprintf(tmp1, "zcat %s | wc -l", filelist_fname);
-    log_msg(6, "tmp1 = %s", tmp1);
-    lines_in_filelist = atol(call_program_and_get_last_line_of_output(tmp1));
-    mr_free(tmp1);
+    mr_asprintf(tmp, "zcat %s | wc -l", filelist_fname);
+    log_msg(6, "tmp = %s", tmp);
+    lines_in_filelist = atol(call_program_and_get_last_line_of_output(tmp));
+    mr_free(tmp);
 
     if (lines_in_filelist < 3) {
@@ -913 +907 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for ((void)fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         (void)fgets(fname, MAX_STR_LEN, pin)) {
-        if ((fname[strlen(fname) - 1] == 13
-             || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
+    for (mr_getline(fname, pin); !feof(pin); mr_getline(fname, pin)) {
+        if ((strlen(fname) > 0) && (fname[strlen(fname) - 1] == 13 || fname[strlen(fname) - 1] == 10)) {
             fname[strlen(fname) - 1] = '\0';
         }
-//      strip_spaces (fname);
         if (!strlen(fname)) {
+            mr_free(fname);
             continue;
         }
@@ -927 +919 @@
                 continue;
             }
-            strcpy(tmp, fname);
+            mr_asprintf(tmp, "%s", fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
+            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
+        mr_free(fname);
+
         if (!(++lino % 1111)) {
             percentage = (int) (lino * 100 / lines_in_filelist);
@@ -939 +934 @@
         }
     }
+    mr_free(fname);
+
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1835 +1832 @@
                                   char *list_of_files_fname, bool flag_em)
 {
-    FILE *fin;
-    char *tmp;
-    struct s_node *nod;
-
-    malloc_string(tmp);
+    FILE *fin = NULL;
+    char *tmp = NULL;
+    struct s_node *nod = NULL;
+
     log_msg(3, "Adding %s to filelist", list_of_files_fname);
     if (!(fin = fopen(list_of_files_fname, "r"))) {
@@ -1845 +1841 @@
         return (1);
     }
-    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(tmp, MAX_STR_LEN, fin)) {
+    for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
         if (!tmp[0]) {
+            mr_free(tmp);
             continue;
         }
-        if ((tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)
-            && strlen(tmp) > 0) {
+        if ((strlen(tmp) > 0) && (tmp[strlen(tmp) - 1] == 13 || tmp[strlen(tmp) - 1] == 10)) {
             tmp[strlen(tmp) - 1] = '\0';
         }
         log_msg(2, "tmp = '%s'", tmp);
         if (!tmp[0]) {
+            mr_free(tmp);
             continue;
         }
@@ -1869 +1865 @@
             log_msg(5, "Flagged '%s'", tmp);
         }
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_fclose(fin);
-    paranoid_free(tmp);
     return (0);
 }