Changeset 2099 in MondoRescue

Timestamp:

Dec 23, 2008, 11:35:19 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Remove some static allocation in a recursive function which lead to mondoarchive consuming wy too much memory.

File:

• branches/2.2.8/mondo/src/common/libmondo-filelist.c (modified) (15 diffs)

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

@@ -1364 +1364 @@
     struct dirent *dit;
     struct stat statbuf;
-    char new[MAX_STR_LEN];
+    char *new;
     char *tmp;
-    char *sth_B;
     static int percentage = 0;
-    char *ith_B;
     char *skip_these;
     char *new_with_spaces;
@@ -1386 +1384 @@
     time_t this_time;
 
-    malloc_string(tmp);
-    sth_B = malloc(8*MAX_STR_LEN);
-    malloc_string(ith_B);
-    malloc_string(new_with_spaces);
     p = strrchr(dir, '/');
     if (p) {
@@ -1423 +1417 @@
         system(strtmp);
         paranoid_free(strtmp);
-        sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =
             1 + atol(call_program_and_get_last_line_of_output(tmp));
+        paranoid_free(tmp);
         sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
@@ -1452 +1447 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    sprintf(tmp, "Reading %-68s", dir);
+                    asprintf(&tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
+                    paranoid_free(tmp);
                 }
 #endif
@@ -1465 +1461 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        skip_these = sth;
+        asprintf(&skip_these, "%s", sth);
     } else {
-        skip_these = sth_B;
-        sprintf(skip_these, " %s ", sth);
-    }
-    sprintf(new_with_spaces, " %s ", dir);
+        asprintf(&skip_these, " %s ", sth);
+    }
+    asprintf(&new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        sprintf(tmp,"opendir %s", dir);
+        asprintf(&tmp,"opendir %s", dir);
         log_OS_error(tmp);
+        paranoid_free(tmp);
     } else if (strstr(skip_these, new_with_spaces)) {
         fprintf(fout, "%s\n", dir); // if excluded dir then print dir ONLY
@@ -1480 +1476 @@
         while ((dit = readdir(dip)) != NULL) {
             i++;
-            strcpy(new, dir);
             if (strcmp(dir, "/")) {
-                strcat(new, "/");
+                asprintf(&new,"%s/%s",dir,dit->d_name);
+            } else {
+                asprintf(&new,"%s%s",dir,dit->d_name);
             }
-            strcat(new, dit->d_name);
-            new_with_spaces[0] = ' ';
-            strcpy(new_with_spaces + 1, new);
-            strcat(new_with_spaces, " ");
+            paranoid_free(new_with_spaces);
+            asprintf(&new_with_spaces, " %s ", new);
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
+                paranoid_free(new_with_spaces);
             } else {
+                paranoid_free(new_with_spaces);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
@@ -1504 +1501 @@
                                 counter = 0;
                                 uberctr++;
-                                sprintf(tmp, " %c ",
+                                asprintf(&tmp, " %c ",
                                         special_dot_char(uberctr));
 #ifndef _XWIN
@@ -1513 +1510 @@
                                 }
 #endif
+                                paranoid_free(tmp);
                             }
                         }
@@ -1518 +1516 @@
                 }
             }
-        }
-    }
+            paranoid_free(new);
+        }
+    }
+    paranoid_free(new_with_spaces);
+    paranoid_free(skip_these);
+
     if (dip) {
         if (closedir(dip) == -1) {
@@ -1533 +1535 @@
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
-    paranoid_free(tmp);
-    paranoid_free(sth_B);
-    paranoid_free(ith_B);
-    paranoid_free(new_with_spaces);
     return (0);
 }
@@ -1587 +1585 @@
                        char *userdef_filelist)
 {
-    char sz_datefile_wildcard[] = MONDO_CACHE"/difflevel.%d";
     char *p, *q;
-    char sz_datefile[80];
+    char *sz_datefile;
     char *sz_filelist, *exclude_paths, *tmp;
     int i;
@@ -1601 +1598 @@
     malloc_string(command);
     malloc_string(tmp);
-    malloc_string(sz_filelist);
     malloc_string(g_skeleton_filelist);
     if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
         fatal_error("Cannot malloc exclude_paths");
     }
-    sprintf(sz_datefile, sz_datefile_wildcard, 0);
+    asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1614 +1610 @@
     sprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    sprintf(sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
     make_hole_for_file(sz_filelist);
 
@@ -1640 +1636 @@
         log_msg(2, "Differential backup. Yay.");
     }
+    paranoid_free(sz_datefile);
 
 // use user-specified filelist (if specified)
@@ -1707 +1704 @@
     sprintf(command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
+    paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    paranoid_free(sz_filelist);
     paranoid_free(command);
     paranoid_free(exclude_paths);