Changeset 1639 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Sep 20, 2007, 10:20:45 PM (18 years ago)

Author:

Bruno Cornec

Message:

More conf file items handled

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive-EXT.h (modified) (1 diff)
• libmondo-archive.c (modified) (6 diffs)
• libmondo-archive.h (modified) (2 diffs)
• libmondo-filelist.c (modified) (4 diffs)
• libmondo-stream.c (modified) (2 diffs)
• libmondo-tools.c (modified) (1 diff)
• mondostructures.h (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-archive-EXT.h

@@ -22 +22 @@
 extern int _move_files_to_stream(struct s_bkpinfo *bkpinfo,
                                  char *files_to_add, ...);
-extern int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
-                                                          *bkpinfo);
 extern void pause_and_ask_for_cdr(int);
 extern int slice_up_file_etc(struct s_bkpinfo *bkpinfo,

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

@@ -58 +58 @@
 #endif                          /* __FreeBSD__ */
 
-extern struct mr_conf *mr_conf;
+extern struct mr_ar_conf *mr_conf;
 
 /*@unused@*/
@@ -534 +534 @@
     char *tmp = NULL;
     char *command = NULL;
-    char *use_lzo_sz = NULL;
-    char *use_gzip_sz = NULL;
-    char *use_comp_sz = NULL;
-    char *use_star_sz = NULL;
     char *bootldr_str = NULL;
     char *tape_device = NULL;
@@ -601 +597 @@
     /* BERLIOS: This parameter is not used after? */
     mr_free(tape_size_sz);
-    if (bkpinfo->use_lzo) {
-        mr_asprintf(&use_lzo_sz, "yes");
-    } else {
-        mr_asprintf(&use_lzo_sz, "no");
-    }
-    if (bkpinfo->use_gzip) {
-        mr_asprintf(&use_gzip_sz, "yes");
-    } else {
-        mr_asprintf(&use_gzip_sz, "no");
-    }
-    if (bkpinfo->use_star) {
-        mr_asprintf(&use_star_sz, "yes");
-    } else {
-        mr_asprintf(&use_star_sz, "no");
-    }
-
-    if (bkpinfo->compression_level > 0) {
-        mr_asprintf(&use_comp_sz, "yes");
-    } else {
-        mr_asprintf(&use_comp_sz, "no");
-    }
 
     mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
@@ -628 +603 @@
     } else {
         mr_asprintf(&cd_recovery_sz, "no");
-    }
-    /* Field shared between LILO/ELILO */
-    if (bkpinfo->make_cd_use_lilo) {
-        mr_asprintf(&use_lilo_sz, "yes");
-    } else {
-        mr_asprintf(&use_lilo_sz, "no");
     }
 
@@ -896 +865 @@
     }
     if (bkpinfo->differential) {
-        mr_fprintf(fd1, "differential=1\n");
-    } else {
-        mr_fprintf(fd1, "differential=0\n");
+        mr_fprintf(fd1, "differential=yes\n");
+    } else {
+        mr_fprintf(fd1, "differential=no\n");
     }
 
@@ -1569 +1538 @@
  * - @c call_burn_iso
  * - @c call_make_iso
- * - @c make_cd_use_lilo
  * - @c manual_tray
  * - @c nonbootable_backup

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

@@ -24 +24 @@
 int _move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add,
                           ...);
-int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
-                                                   *bkpinfo);
 void pause_and_ask_for_cdr(int);
 void set_bit_N_of_array(char *array, int N, bool true_or_false);
@@ -34 +32 @@
 int verify_data(struct s_bkpinfo *bkpinfo);
 void wipe_archives(char *d);
-int write_image_to_floppy(char *device, char *datafile);
-int write_image_to_floppy_SUB(char *device, char *datafile);
 int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd);
 int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo);

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

@@ -41 +41 @@
 
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
+                       char *include_paths, char *excp, bool differential,
                        char *userdef_filelist);
 
@@ -1512 +1512 @@
  */
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
+                       char *include_paths, char *excp, bool differential,
                        char *userdef_filelist)
 {
@@ -1547 +1547 @@
     make_hole_for_file(sz_filelist);
 
-    if (differential == 0) {
+    if (! differential) {
         // restore last good datefile if it exists
         mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
@@ -1568 +1568 @@
         mr_msg(2,
                 "Warning - unable to find date of previous backup. Full backup instead.");
-        differential = 0;
+        differential = FALSE;
         time_of_last_full_backup = 0;
     } else {

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

@@ -40 +40 @@
 extern char *MONDO_LOGFILE;
 
-extern struct mr_conf *mr_conf;
+extern struct mr_ar_conf *mr_conf;
 
 /**
@@ -1106 +1106 @@
     }
     if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
-        mediasize - (SLICE_SIZE * 4 / 1024)) {
+        mediasize - 16) { /* 4096(old SLICE_SIZE) * 4 / 1024) */
         log_it("g_tape_posK = %ld\nmediasize = %ld\n", g_tape_posK,
                mediasize);

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

@@ -743 +743 @@
     bkpinfo->differential = FALSE;
     bkpinfo->writer_speed = mr_conf->iso_burning_speed;
-// patch by Herman Kuster  
-    bkpinfo->differential = 0;
-// patch end
     bkpinfo->compression_level = 3;
 }

branches/stable/mondo/src/common/mondostructures.h

@@ -553 +553 @@
     bool wipe_media_first;
 
-// patch by Herman Kuster  
-  /**
-   * The differential level of this backup. Currently only 0 (full backup) and 1
+  /**
+   * The differential level of this backup. Currently only FALSE (full backup) and TRUE
    * (files changed since last full backup) are supported.
    */
-    int differential;
-// end patch  
+    bool differential;
 
   /**