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

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

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

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

@@ -847 +847 @@
 {
 
-    /*@ structures ************************************************* */
-    struct s_node *filelist;
-
-    /*@ pointers *************************************************** */
-    FILE *pin;
-
-    /*@ buffers **************************************************** */
-    char *command_to_open_fname;
+    struct s_node *filelist = NULL;
+    FILE *pin = NULL;
+    char *command_to_open_fname = NULL;
     char *fname = NULL;
-    char *tmp;
-    int pos_in_fname;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    int pos_in_fname = 0;
     size_t n = 0;
-    /*@ int ******************************************************** */
-    int percentage;
-
-    /*@ long ******************************************************* */
-    long lines_in_filelist;
-    long lino = 0;
-    /*@ end vars *************************************************** */
+    int percentage = 0;
+
+    long lines_in_filelist = 0L;
+    long lino = 0L;
 
     assert_string_is_neither_NULL_nor_zerolength(filelist_fname);
@@ -876 +869 @@
     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));
+    tmp1 = call_program_and_get_last_line_of_output(tmp);
     paranoid_free(tmp);
+
+    lines_in_filelist = atol(tmp1);
+    paranoid_free(tmp1);
 
     if (lines_in_filelist < 3) {
@@ -1322 +1317 @@
                       char *skeleton_filelist)
 {
-    DIR *dip;
-    struct dirent *dit;
+    DIR *dip = NULL;
+    struct dirent *dit = NULL;
     struct stat statbuf;
-    char *new;
-    char *tmp;
+    char *new = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     static int percentage = 0;
-    char *skip_these;
-    char *new_with_spaces;
-    static char *name_of_evalcall_form;
-    int i;
+    char *skip_these = NULL;
+    char *new_with_spaces = NULL;
+    static char *name_of_evalcall_form = NULL;
+    int i = 0;
     static int depth = 0;
-    char *p;
+    char *p = NULL;
     static int counter = 0;
     static int uberctr = 0;
-    static char *find_skeleton_marker;
+    static char *find_skeleton_marker = NULL;
     static long skeleton_lino = 0;
     static time_t last_time = 0;
@@ -1365 +1361 @@
 
         asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist);
-        g_skeleton_entries =
-            1 + atol(call_program_and_get_last_line_of_output(tmp));
+        tmp1 = call_program_and_get_last_line_of_output(tmp);
         paranoid_free(tmp);
+
+        g_skeleton_entries = 1 + atol(tmp1);
+        paranoid_free(tmp1);
 
         asprintf(&name_of_evalcall_form, "Making catalog of %s", dir);
@@ -1534 +1532 @@
 {
     char sz_datefile_wildcard[] = "/var/cache/mondo/difflevel.%d";
-    char *p, *q;
+    char *p = NULL;
+    char *q = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *sz_datefile;
-    char *sz_filelist, *exclude_paths;
-    int i;
-    FILE *fout;
-    char *command;
+    char *sz_filelist = NULL;
+    char *exclude_paths = NULL;
+    int i = 0;
+    FILE *fout = NULL;
+    char *command = NULL;
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
-    char *skeleton_filelist;
+    char *skeleton_filelist = NULL;
+
     // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
-
     asprintf(&sz_datefile, sz_datefile_wildcard, 0);
     if (!include_paths && !userdef_filelist) {
@@ -1573 +1576 @@
         }
         make_hole_for_file(sz_datefile);
-        write_one_liner_data_file(sz_datefile,
-                                  call_program_and_get_last_line_of_output
-                                  ("date +%s"));
+        tmp = call_program_and_get_last_line_of_output("date +%s");
+        write_one_liner_data_file(sz_datefile, tmp);
+        paranoid_free(tmp);
     } else if (lstat(sz_datefile, &statbuf)) {
         log_msg(2,
@@ -1600 +1603 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
+        tmp = call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null");
+        tmp1 = call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null");
+        tmp2 = call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null");
         asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
-/proc /sys /tmp /var/cache/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);
+/proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, tmp, tmp1, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_free(tmp);
+        paranoid_free(tmp1);
+        paranoid_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);