Changeset 1663 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Sep 27, 2007, 12:21:18 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix bug #197 (based on an initial patch of Scott Cummings)
• Fix a bug where df was using locale to print messages and wasn't filtered correctly
• mkdtemp checked in configure
• reset_bkpinfo called as early as possible by both main program.
• It creates a tmpdir cleanly with mkdtemp in setup_tmpdir subfunction, which takes in account TMPIR and TMP env var. Remains to see what tmpfs does and tests
• configure.in should also be filtered.
• Remove g_bkpinfo_DONTUSETHIS
• remove bkpinfo also from header files
• Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
• Apply patch from Andree Leidenfrost, modified a bit to use bkpinfo->tmpdir instead of /tmp or MINDI_CACHE when appropriate. Fix security issues in mondo. Thanks al ot Andree for catching all those issues.
• /tmp => /var/log for mondorestore.log in mindi
• Update linux terminfo to fix a color issue (Andree Leidenfrost)
• Removes useless log file (Andree Leidenfrost)
• replace vi with find_my_editor during restore (Andree Leidenfrost)
• sync in bg in mindi (VMWare issue to look at)
• mindi/mindi-busybox have a different version than mondo for pb
• PB-SUF also added to spec file
• Fix a bug for pb build (omission of PB-SUF declaration)

(merge -r1631:1662 $SVN_M/branches/2.2.5)

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (62 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -79 +79 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 
 
@@ -198 +201 @@
 
 int
-archive_this_fileset_with_star(struct s_bkpinfo *bkpinfo, char *filelist,
-                               char *fname, int setno)
+archive_this_fileset_with_star(char *filelist, char *fname, int setno)
 {
     int retval = 0;
@@ -297 +299 @@
  */
 int
-archive_this_fileset(struct s_bkpinfo *bkpinfo, char *filelist,
-                     char *fname, int setno)
+archive_this_fileset(char *filelist, char *fname, int setno)
 {
 
@@ -319 +320 @@
 
     if (bkpinfo->compression_level > 0 && bkpinfo->use_star) {
-        return (archive_this_fileset_with_star
-                (bkpinfo, filelist, fname, setno));
+        return (archive_this_fileset_with_star(filelist, fname, setno));
     }
 
@@ -431 +431 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo)
+int backup_data()
 {
     int retval = 0, res = 0;
@@ -437 +437 @@
 
     assert(bkpinfo != NULL);
-    set_g_cdrom_and_g_dvd_to_bkpinfo_value(bkpinfo);
+    set_g_cdrom_and_g_dvd_to_bkpinfo_value();
 
     if (bkpinfo->backup_media_type == dvd) {
@@ -452 +452 @@
     }
 
-    if ((res = prepare_filelist(bkpinfo))) {    /* generate scratchdir/filelist.full */
+    if ((res = prepare_filelist())) {   /* generate scratchdir/filelist.full */
         fatal_error("Failed to generate filelist catalog");
     }
-    if (call_filelist_chopper(bkpinfo)) {
+    if (call_filelist_chopper()) {
         fatal_error("Failed to run filelist chopper");
     }
@@ -472 +472 @@
     mr_free(tmp);
 
-    copy_mondo_and_mindi_stuff_to_scratchdir(bkpinfo);  // payload, too, if it exists
+    copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
 #if __FreeBSD__ == 5
     strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
@@ -486 +486 @@
 #error "I don't know about this system!"
 #endif
-    if ((res = call_mindi_to_supply_boot_disks(bkpinfo))) {
+    if ((res = call_mindi_to_supply_boot_disks())) {
         fatal_error("Failed to generate boot+data disks");
     }
-    retval += do_that_initial_phase(bkpinfo);   // prepare
+    retval += do_that_initial_phase();  // prepare
     mr_asprintf(&tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
     mr_free(tmp);
-    retval += make_those_afios_phase(bkpinfo);  // backup regular files
-    retval += make_those_slices_phase(bkpinfo); // backup BIG files
-    retval += do_that_final_phase(bkpinfo); // clean up
+    retval += make_those_afios_phase(); // backup regular files
+    retval += make_those_slices_phase();    // backup BIG files
+    retval += do_that_final_phase();    // clean up
     mr_msg(1, "Creation of archives... complete.");
     if (bkpinfo->verify_data) {
@@ -529 +529 @@
  * @ingroup MLarchiveGroup
  */
-int call_mindi_to_supply_boot_disks(struct s_bkpinfo *bkpinfo)
+int call_mindi_to_supply_boot_disks()
 {
     /*@ buffer ************************************************************ */
@@ -1005 +1005 @@
     char *curr_acl_list_fname;
 
-    struct s_bkpinfo *bkpinfo;
+    struct s_bkpinfo *bkpinfo_bis;
     char *tmp = NULL;
     int res = 0, retval = 0;
@@ -1020 +1020 @@
     p_next_set_to_archive = (int *) (inbuf + 8);
     p_list_of_fileset_flags = (char *) (inbuf + 12);
-    bkpinfo = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
+    bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
     sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
@@ -1088 +1088 @@
         mr_msg(4, "[%d:%d] - archiving %d...", getpid(),
                 this_thread_no, archiving_set_no);
-        res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
+        res =
+            archive_this_fileset(archiving_filelist_fname,
                                  archiving_afioball_fname,
                                  archiving_set_no);
@@ -1141 +1142 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo)
+int do_that_final_phase()
 {
 
@@ -1157 +1158 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         /* write tape/cdstream */
-        closeout_tape(bkpinfo);
+        closeout_tape();
     } else {
         /* write final ISO/USB */
-        res = write_final_iso_if_necessary(bkpinfo);
+        res = write_final_iso_if_necessary();
         retval += res;
         if (res) {
@@ -1200 +1201 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_initial_phase(struct s_bkpinfo *bkpinfo)
+int do_that_initial_phase()
 {
     /*@ int *************************************** */
@@ -1309 +1310 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images()
 {
 
@@ -1367 +1368 @@
                        _("Please wait. This may take a couple of hours."),
                        _("Working..."),
-                       get_last_filelist_number(bkpinfo) + 1);
+                       get_last_filelist_number() + 1);
 
     srand((unsigned int) getpid());
@@ -1433 +1434 @@
                 sleep(5);
             }
-            strcpy(media_usage_comment,
-                   percent_media_full_comment(bkpinfo));
+            strcpy(media_usage_comment, percent_media_full_comment());
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1442 +1442 @@
                                                        storing_afioball_fname);
                 iamhere("Writing EXAT files");
-                res += write_EXAT_files_to_tape(bkpinfo,
-                                                curr_xattr_list_fname,
+                res += write_EXAT_files_to_tape(curr_xattr_list_fname,
                                                 curr_acl_list_fname);
                 // archives themselves
                 res +=
-                    move_files_to_stream(bkpinfo, storing_afioball_fname,
+                    move_files_to_stream(storing_afioball_fname,
                                          NULL);
             } else {
                 if (g_getfacl) {
                     if (g_getfattr) {
-                        res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                        res = move_files_to_cd(storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
                                      storing_afioball_fname, NULL);
                     } else {
-                        res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                        res = move_files_to_cd(storing_filelist_fname,
                                     curr_acl_list_fname,
                                     storing_afioball_fname, NULL);
@@ -1463 +1462 @@
                 } else {
                     if (g_getfattr) {
-                            res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                            res = move_files_to_cd(storing_filelist_fname,
                                     curr_xattr_list_fname,
                                     storing_afioball_fname, NULL);
                     } else {
-                            res = move_files_to_cd(bkpinfo, storing_filelist_fname,
+                            res = move_files_to_cd(storing_filelist_fname,
                                     storing_afioball_fname, NULL);
                     }
@@ -1545 +1544 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
+int make_iso_fs(char *destfile)
 {
     /*@ int ********************************************** */
@@ -1592 +1591 @@
         mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                 g_current_media_number);
-        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
+        res = eval_call_to_make_ISO(bkpinfo->call_before_iso,
                                 destfile, g_current_media_number,
                                 MONDO_LOGFILE, message_to_screen);
@@ -1618 +1617 @@
                 ("Serious error(s) occurred already. I shan't try to write to media.");
         } else {
-            res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+            res = eval_call_to_make_ISO(bkpinfo->call_make_iso,
                                         destfile, g_current_media_number,
                                         MONDO_LOGFILE, message_to_screen);
@@ -1680 +1679 @@
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 res =
-                    eval_call_to_make_ISO(bkpinfo, bkpinfo->call_make_iso,
+                    eval_call_to_make_ISO(bkpinfo->call_make_iso,
                                           destfile,
                                           g_current_media_number,
@@ -1724 +1723 @@
                  bkpinfo->backup_media_string,
                  g_current_media_number);
-        res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
+        res = eval_call_to_make_ISO(bkpinfo->call_after_iso,
                                     destfile, g_current_media_number,
                                     MONDO_LOGFILE, message_to_screen);
@@ -1783 +1782 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
+make_slices_and_images(char *biggielist_fname)
 {
 
@@ -1814 +1813 @@
 
     estimated_total_noof_slices =
-        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+        size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1;
 
     mr_msg(1, "size of all biggiefiles = %ld",
-            size_of_all_biggiefiles_K(bkpinfo));
+            size_of_all_biggiefiles_K());
     mr_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld",
-            size_of_all_biggiefiles_K(bkpinfo), bkpinfo->optimal_set_size,
+            size_of_all_biggiefiles_K(), bkpinfo->optimal_set_size,
             estimated_total_noof_slices);
 
@@ -1909 +1908 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, bigfile_fname,
+                slice_up_file_etc(bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -1957 +1956 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
+int make_afioballs_and_images_OLD()
 {
 
@@ -1983 +1982 @@
                        _("Please wait. This may take a couple of hours."),
                        _("Working..."),
-                       get_last_filelist_number(bkpinfo) + 1);
+                       get_last_filelist_number() + 1);
 
     mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
@@ -2007 +2006 @@
 
         mr_msg(1, "Archiving set %ld", curr_set_no);
-        res = archive_this_fileset(bkpinfo, curr_filelist_fname,
+        res = archive_this_fileset(curr_filelist_fname,
                                  curr_afioball_fname, curr_set_no);
         retval += res;
@@ -2018 +2017 @@
         }
 
-        strcpy(media_usage_comment, percent_media_full_comment(bkpinfo));
+        strcpy(media_usage_comment, percent_media_full_comment());
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2027 +2026 @@
                                                    curr_afioball_fname);
             iamhere("Writing EXAT files");
-            res += write_EXAT_files_to_tape(bkpinfo, curr_xattr_list_fname,
+            res += write_EXAT_files_to_tape(curr_xattr_list_fname,
                                             curr_acl_list_fname);
             // archives themselves
-            res = move_files_to_stream(bkpinfo, curr_afioball_fname, NULL);
+            res = move_files_to_stream(curr_afioball_fname, NULL);
         } else {
                 if (g_getfacl) {
                     if (g_getfattr) {
-                        res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                        res = move_files_to_cd(curr_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
                                      curr_afioball_fname, NULL);
                     } else {
-                        res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                        res = move_files_to_cd(curr_filelist_fname,
                                     curr_acl_list_fname,
                                     curr_afioball_fname, NULL);
@@ -2045 +2044 @@
                 } else {
                     if (g_getfattr) {
-                            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                            res = move_files_to_cd(curr_filelist_fname,
                                     curr_xattr_list_fname,
                                     curr_afioball_fname, NULL);
                     } else {
-                            res = move_files_to_cd(bkpinfo, curr_filelist_fname,
+                            res = move_files_to_cd(curr_filelist_fname,
                                     curr_afioball_fname, NULL);
                     }
@@ -2097 +2096 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
+int make_those_afios_phase()
 {
     /*@ int ******************************************* */
@@ -2114 +2113 @@
         mr_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo);
+        res = make_afioballs_and_images_OLD();
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo);
+        res = make_afioballs_and_images_OLD();
 #endif
         write_header_block_to_stream((off_t)0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo);
+        res = make_afioballs_and_images();
     }
 
@@ -2143 +2142 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_slices_phase(struct s_bkpinfo *bkpinfo)
+int make_those_slices_phase()
 {
 
@@ -2195 +2194 @@
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
+        res += write_EXAT_files_to_tape(xattr_fname, acl_fname);
         mr_asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
@@ -2207 +2206 @@
     }
 
-    res = make_slices_and_images(bkpinfo, biggielist);
+    res = make_slices_and_images(biggielist);
     mr_free(biggielist);
 
@@ -2234 +2233 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
+int (*move_files_to_cd) (char *, ...) =
     _move_files_to_cd;
 
@@ -2255 +2254 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
+int _move_files_to_cd(char *files_to_add, ...)
 {
 
@@ -2296 +2295 @@
     if (would_occupy / 1024 > bkpinfo->media_size) {
         /* FALSE because this is not the last CD we'll write */
-        res = write_iso_and_go_on(bkpinfo, FALSE);
+        res = write_iso_and_go_on(FALSE);
         retval += res;
         if (res) {
@@ -2344 +2343 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_stream) (struct s_bkpinfo *, char *, ...) =
+int (*move_files_to_stream) (char *, ...) =
     _move_files_to_stream;
 
@@ -2361 +2360 @@
  */
 int
-_move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
+_move_files_to_stream(char *files_to_add, ...)
 {
 
@@ -2405 +2404 @@
             type = other;
         }
-        res = write_file_to_stream_from_file(bkpinfo, curr_file);
+        res = write_file_to_stream_from_file(curr_file);
         retval += res;
         unlink(curr_file);
@@ -2517 +2516 @@
     }
     log_to_screen("Scanning CD-ROM drive...");
-    sprintf(mtpt, "/tmp/cd.mtpt.%ld.%ld", (long int) random(),
-            (long int) random());
+    sprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
     make_hole_for_dir(mtpt);
 
@@ -2670 +2668 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
+slice_up_file_etc(char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -2797 +2795 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res =
-            move_files_to_stream(bkpinfo,
-                                 slice_fname(biggie_file_number, 0,
+            move_files_to_stream(slice_fname(biggie_file_number, 0,
                                              bkpinfo->tmpdir, ""), NULL);
     } else {
         res =
-            move_files_to_cd(bkpinfo,
-                             slice_fname(biggie_file_number, 0,
+            move_files_to_cd(slice_fname(biggie_file_number, 0,
                                          bkpinfo->tmpdir, ""), NULL);
     }
@@ -2823 +2819 @@
                            suffix));
 
-        mr_asprintf(&tmp, percent_media_full_comment(bkpinfo));
+        mr_asprintf(&tmp, percent_media_full_comment());
         update_progress_form(tmp);
         mr_free(tmp);
@@ -2917 +2913 @@
             maintain_collection_of_recent_archives(bkpinfo->tmpdir,
                                                    file_to_archive);
-            res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
+            res = move_files_to_stream(file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
+            res = move_files_to_cd(file_to_archive, NULL);
         }
         mr_free(file_to_archive);
@@ -3014 +3010 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
+int write_final_iso_if_necessary()
 {
     /*@ int ***************************************************** */
@@ -3037 +3033 @@
 #endif
     mr_free(tmp);
-    res = write_iso_and_go_on(bkpinfo, TRUE);
+    res = write_iso_and_go_on(TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3065 +3061 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
+int write_iso_and_go_on(bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3147 +3143 @@
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {
-            res = make_iso_fs(bkpinfo, isofile);
+            res = make_iso_fs(isofile);
         } else {
         }
@@ -3168 +3164 @@
             chdir("/");
             iamhere("Before calling verify_cd_image()");
-            res += verify_cd_image(bkpinfo);
+            res += verify_cd_image();
             iamhere("After calling verify_cd_image()");
         }
@@ -3227 +3223 @@
  * @ingroup verifyGroup
  */
-int verify_data(struct s_bkpinfo *bkpinfo)
+int verify_data()
 {
     int res = 0, retval = 0, cdno = 0;
@@ -3238 +3234 @@
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
-        verify_tape_backups(bkpinfo);
+        verify_tape_backups();
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     } else if (bkpinfo->backup_data)
@@ -3245 +3241 @@
         mr_msg(2,
                 "Not verifying again. Per-CD/ISO verification already carried out.");
-        paranoid_system
-            ("cat /tmp/changed.files.* > /tmp/changed.files 2> /dev/null");
+        sprintf(tmp, "cat %s/changed.files > %s/changed.files 2> /dev/null",bkpinfo->tmpdir, MINDI_CACHE);
+        paranoid_system(tmp);
     } else {
         g_current_media_number = cdno;
@@ -3258 +3254 @@
             }
             if (bkpinfo->backup_media_type != iso) {
-                insist_on_this_cd_number(bkpinfo, cdno);
-            }
-            res = verify_cd_image(bkpinfo); // sets verify_data to FALSE if it's time to stop verifying
+                insist_on_this_cd_number(cdno);
+            }
+            res = verify_cd_image();    // sets verify_data to FALSE if it's time to stop verifying
             retval += res;
             if (res) {
                 mr_asprintf(&tmp,
-                         "Warnings/errors were reported while checking %s #%d",
-                         bkpinfo->backup_media_string,
-                         g_current_media_number);
+                        "Warnings/errors were reported while checking %s #%d",
+                        media_descriptor_string(bkpinfo->backup_media_type),
+                        g_current_media_number);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -3273 +3269 @@
         }
         mr_asprintf(&tmp,
-                 "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
-                 MONDO_LOGFILE);
+                "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
+                MONDO_LOGFILE, MINDI_CACHE);
         system(tmp);
         mr_free(tmp);
 
         mr_asprintf(&tmp,
-                 "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> /tmp/changed.files",
-                 MONDO_LOGFILE);
+                "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files",
+                MONDO_LOGFILE, MINDI_CACHE);
         system(tmp);
         mr_free(tmp);
@@ -3287 +3283 @@
         eject_device(bkpinfo->media_device);
     }
-    diffs = count_lines_in_file("/tmp/changed.files");
+    sprintf(tmp, "%s/changed.files", MINDI_CACHE);
+    diffs = count_lines_in_file(tmp);
 
     if (diffs > 0) {