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

Timestamp:

Aug 18, 2009, 3:05:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3334@localhost: bruno | 2009-08-08 12:17:37 +0200

• Change mr_asprintf interface to pass only the char * (makes bkpinfo usage more easy)

File:

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

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

@@ -97 +97 @@
     log_to_screen("Dividing filelist into sets. Please wait.");
     i = 0;
-    mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
+    mr_asprintf(filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
         log_it("filelist %s not found", filelist);
@@ -108 +108 @@
     estimate_noof_media_required(noof_sets);    // for cosmetic purposes
 
-    mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
@@ -158 +158 @@
     }                           // no sense in trying to sort an empty file
 
-    mr_asprintf(&tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
-
-    mr_asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
+    mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
+
+    mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
     mr_free(command);
@@ -168 +168 @@
     } else {
         log_msg(5, "Sorted %s --> %s OK. Copying it back to %s now", orig_fname, tmp_fname, orig_fname);
-        mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
+        mr_asprintf(command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 5);
         mr_free(command);
@@ -240 +240 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    mr_asprintf(&outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
-    mr_asprintf(&biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
+    mr_asprintf(biggie_fname, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -293 +293 @@
                 curr_set_size = 0;
 
-                mr_asprintf(&outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
+                mr_asprintf(outfname, "%s/filelist.%ld", bkpinfo->tmpdir, curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
                     log_OS_error("Unable to openout outfname");
@@ -323 +323 @@
     mr_free(biggie_fname);
 
-    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(&tmp, "%ld", curr_set_no);
+    mr_asprintf(outfname, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
+    mr_asprintf(tmp, "%ld", curr_set_no);
     if (write_one_liner_data_file(outfname, tmp)) {
         log_OS_error
@@ -334 +334 @@
 
     if (curr_set_no == 0) {
-        mr_asprintf(&tmp, "Only one fileset. Fine.");
+        mr_asprintf(tmp, "Only one fileset. Fine.");
     } else {
-        mr_asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+        mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
     log_msg(1, tmp);
@@ -453 +453 @@
         return (1);
     }
-    mr_asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
+    mr_asprintf(pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
@@ -471 +471 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
-        mr_asprintf(&strtmp, syscall_sprintf, tmp);
+        mr_asprintf(strtmp, syscall_sprintf, tmp);
         paranoid_free(tmp);
-        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);  // " MONDO_LOGFILE);
+        mr_asprintf(syscall, "%s 2>> /dev/null", strtmp);   // " MONDO_LOGFILE);
         paranoid_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
@@ -491 +491 @@
 
     if (g_getfacl != NULL) {
-        mr_asprintf(&command, "touch %s", facl_fname);
+        mr_asprintf(command, "touch %s", facl_fname);
         run_program_and_log_output(command, 8);
         mr_free(command);
 
-        mr_asprintf(&command, "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s", filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
+        mr_asprintf(command, "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s", filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         log_it("%s",command);
         retval = system(command);
@@ -510 +510 @@
 
     if (g_getfattr != NULL) {
-        mr_asprintf(&command, "touch %s", fattr_fname);
+        mr_asprintf(command, "touch %s", fattr_fname);
         run_program_and_log_output(command, 8);
         mr_free(command);
@@ -540 +540 @@
         || !does_file_exist(orig_msklist)) {
         log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
-        mr_asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
+        mr_asprintf(command, "gzip -dc %s | %s --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
@@ -554 +554 @@
     malloc_string(current_subset_file);
     malloc_string(current_master_file);
-    mr_asprintf(&masklist, "%s/masklist", bkpinfo->tmpdir);
-    mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
+    mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
+    mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
     mr_free(command);
@@ -562 +562 @@
     current_subset_file[0] = current_master_file[0] = '\0';
 
-    mr_asprintf(&syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
+    mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
     log_msg(1, "syscall_pout = %s", syscall_pout);
     pout = popen(syscall_pout, "w");
@@ -573 +573 @@
     }
 
-    mr_asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
+    mr_asprintf(syscall_pin, "gzip -dc %s", original_exat_fname);
     log_msg(1, "syscall_pin = %s", syscall_pin);
     pin = popen(syscall_pin, "r");
@@ -714 +714 @@
 
     strcpy(val_sz,"");
-    mr_asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
     mr_free(cfg_fname);
@@ -876 +876 @@
     }
     log_to_screen("Loading filelist");
-    mr_asprintf(&tmp1, "zcat %s | wc -l", filelist_fname);
+    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));
@@ -896 +896 @@
     (filelist->down)->expanded = (filelist->down)->selected = FALSE;
 
-    mr_asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
+    mr_asprintf(command_to_open_fname, "gzip -dc %s", filelist_fname);
     if (!(pin = popen(command_to_open_fname, "r"))) {
         log_OS_error("Unable to openin filelist_fname");
@@ -1368 +1368 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        mr_asprintf(&find_excludes, " ");
+        mr_asprintf(find_excludes, " ");
         if (sth != NULL) {
             while((token = mr_strtok(sth, delims, &lastpos))) {
@@ -1377 +1377 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(&strtmp, "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        mr_asprintf(&strtmp, "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
 #endif
         mr_free(find_excludes);
@@ -1388 +1388 @@
         mr_free(strtmp);
 
-        mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
+        mr_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));
         mr_free(tmp);
@@ -1414 +1414 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    mr_asprintf(&tmp, "Reading %-68s", dir);
+                    mr_asprintf(tmp, "Reading %-68s", dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);
@@ -1428 +1428 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        mr_asprintf(&skip_these, "%s", sth);
+        mr_asprintf(skip_these, "%s", sth);
     } else {
-        mr_asprintf(&skip_these, " %s ", sth);
-    }
-    mr_asprintf(&new_with_spaces, " %s ", dir);
+        mr_asprintf(skip_these, " %s ", sth);
+    }
+    mr_asprintf(new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
-        mr_asprintf(&tmp,"opendir %s", dir);
+        mr_asprintf(tmp,"opendir %s", dir);
         log_OS_error(tmp);
         paranoid_free(tmp);
@@ -1444 +1444 @@
             i++;
             if (strcmp(dir, "/")) {
-                mr_asprintf(&new,"%s/%s",dir,dit->d_name);
+                mr_asprintf(new,"%s/%s",dir,dit->d_name);
             } else {
-                mr_asprintf(&new,"%s%s",dir,dit->d_name);
+                mr_asprintf(new,"%s%s",dir,dit->d_name);
             }
             paranoid_free(new_with_spaces);
-            mr_asprintf(&new_with_spaces, " %s ", new);
+            mr_asprintf(new_with_spaces, " %s ", new);
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
@@ -1468 +1468 @@
                                 counter = 0;
                                 uberctr++;
-                                mr_asprintf(&tmp, " %c ", special_dot_char(uberctr));
+                                mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
 #ifndef _XWIN
                                 if (!g_text_mode) {
@@ -1521 +1521 @@
     bool in_quotes = FALSE;
 
-    mr_asprintf(&sz_res, "%s", incoming);
+    mr_asprintf(sz_res, "%s", incoming);
     p = sz_res;
     while ((*p != ' ' || in_quotes) && *p != '\0') {
@@ -1563 +1563 @@
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
-    mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1569 +1569 @@
     }
     // make hole for filelist
-    mr_asprintf(&command, "mkdir -p %s/archives", bkpinfo->scratchdir);
+    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+    mr_asprintf(sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
     make_hole_for_file(sz_filelist);
 
     if (differential == 0) {
         // restore last good datefile if it exists
-        mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        mr_asprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
         run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1584 +1584 @@
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            mr_asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile,
                     sz_datefile);
             paranoid_system(command);
@@ -1609 +1609 @@
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
-        mr_asprintf(&command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
             mr_free(command);
@@ -1620 +1620 @@
         }
         log_msg(1, "Calculating filelist");
-        mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
         if (strlen(tmp2) < 1) {
-            mr_asprintf(&tmp1," ");
+            mr_asprintf(tmp1," ");
         } else {
             log_msg(2, "Found windows FS: %s",tmp2);
-            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             paranoid_free(tmp2);
-            mr_asprintf(&tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }
         mr_free(tmp1);
 
-        mr_asprintf(&exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
+        mr_asprintf(exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
         mr_free(tmp2);
 
@@ -1667 +1667 @@
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    mr_asprintf(&command, "mkdir -p %s/archives", bkpinfo->scratchdir);
+    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
+    mr_asprintf(command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
+    mr_asprintf(command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
     paranoid_system(command);
     mr_free(command);