Changeset 783 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (54 diffs)

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

@@ -10 +10 @@
  */
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
+#include "mr_conf.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -80 +81 @@
  */
 t_bkptype g_backup_media_type = none;
+char *g_backup_media_string = NULL;
 
 /**
@@ -231 +233 @@
         log_msg(5, "command='%s'", command);
         res = system(command);
-        tmp = last_line_of_file(MONDO_LOGFILE));
+        tmp = last_line_of_file(MONDO_LOGFILE);
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -390 +392 @@
     }
 
-    if (g_tmpfs_mountpt[0] != '\0') {
+    if (g_tmpfs_mountpt != NULL) {
         tmp = call_program_and_get_last_line_of_output
                  ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4");
@@ -424 +426 @@
  * @ingroup archiveGroup
  */
-int backup_data(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int backup_data(struct s_bkpinfo *bkpinfo)
 {
     int retval = 0, res = 0;
@@ -651 +653 @@
         else
             ch = 'U';
+
         if (bkpinfo->boot_loader != '\0') {
             asprintf(&tmp, "User specified boot loader. It is '%c'.",
@@ -743 +746 @@
     }
     paranoid_free(tmp);
+    /* BERLIOS: Use bkptype_to_string without LANG */
     switch (bkpinfo->backup_media_type) {
     case cdr:
@@ -1106 +1110 @@
  * @ingroup MLarchiveGroup
  */
-int do_that_final_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int do_that_final_phase(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1125 +1129 @@
     } else {
         /* write final ISO */
-        res = write_final_iso_if_necessary(bkpinfo, mrconf);
+        res = write_final_iso_if_necessary(bkpinfo);
         retval += res;
         if (res) {
@@ -1178 +1182 @@
     g_serial_string = call_program_and_get_last_line_of_output("dd \
 if=/dev/urandom bs=16 count=1 2> /dev/null | \
-hexdump | tr -s ' ' '0' | head -n1"));
+hexdump | tr -s ' ' '0' | head -n1");
     asprintf(&tmp, "%s...word.", g_serial_string);
     paranoid_free(g_serial_string);
@@ -1269 +1273 @@
     }
 /* if not Debian then go ahead & use fdformat */
-    tempfile = call_program_and_get_last_line_of_output("mktemp -q /tmp/mondo.XXXXXXXX"));
+    tempfile = call_program_and_get_last_line_of_output("mktemp -q /tmp/mondo.XXXXXXXX");
     asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile,
              tempfile, tempfile);
@@ -1294 +1298 @@
         if (trackno <= 5 && last_trkno > 40) {
             close_evalcall_form();
-            strcpy(title, "Verifying format");
-            open_evalcall_form(title);
+            open_evalcall_form("Verifying format");
         }
         last_trkno = trackno;
@@ -1401 +1404 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_afioballs_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images(struct s_bkpinfo *bkpinfo)
 {
 
@@ -1544 +1547 @@
             } else {
                 res =
-                    move_files_to_cd(bkpinfo, mrconf, storing_filelist_fname,
+                    move_files_to_cd(bkpinfo, storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
@@ -1624 +1627 @@
  * @return The number of errors encountered (0 for success)
  */
-int make_iso_fs(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *destfile)
+int make_iso_fs(struct s_bkpinfo *bkpinfo, char *destfile)
 {
     /*@ int ********************************************** */
@@ -1667 +1670 @@
     /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    asprintf(&tmp, "chmod 744 %s", bkpinfo->scratchdir);
+    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     chdir(bkpinfo->scratchdir);
 
-    if (bkpinfo->call_before_iso[0] != '\0') {
+    if (bkpinfo->call_before_iso != NULL) {
         asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                  g_current_media_number);
@@ -1687 +1690 @@
     }
 
-    if (bkpinfo->call_make_iso[0] != '\0') {
+    if (bkpinfo->call_make_iso != NULL) {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         asprintf(&message_to_screen, "Making an ISO (%s #%d)",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
 
@@ -1789 +1792 @@
     } else {
         asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         log_msg(1, message_to_screen);
         asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
@@ -1818 +1821 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", mrconf->ia64_boot_size);
+                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
                                             tmp2,
@@ -1870 +1873 @@
     }
 
-    if (bkpinfo->call_burn_iso[0] != '\0') {
+    if (bkpinfo->call_burn_iso != NULL) {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         asprintf(&message_to_screen, "Burning %s #%d",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
@@ -1888 +1891 @@
     }
 
-    if (bkpinfo->call_after_iso[0] != '\0') {
+    if (bkpinfo->call_after_iso != NULL) {
         asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
-                 media_descriptor_string(bkpinfo->backup_media_type),
+                 bkpinfo->backup_media_string,
                  g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_after_iso,
@@ -1922 +1925 @@
              bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    tmp = call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     log_msg(1, "--> tmp = '%s'", tmp);
     paranoid_free(command);
@@ -1951 +1954 @@
  */
 int
-make_slices_and_images(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggielist_fname)
+make_slices_and_images(struct s_bkpinfo *bkpinfo, char *biggielist_fname)
 {
 
@@ -2070 +2073 @@
             }
             res =
-                slice_up_file_etc(bkpinfo, mrconf, bigfile_fname,
+                slice_up_file_etc(bkpinfo, bigfile_fname,
                                   ntfsprog_fifo, biggie_file_number,
                                   noof_biggie_files, use_ntfsprog);
@@ -2119 +2122 @@
  * @see make_afioballs_and_images
  */
-int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_afioballs_and_images_OLD(struct s_bkpinfo *bkpinfo)
 {
 
@@ -2193 +2196 @@
         } else {
             res =
-                move_files_to_cd(bkpinfo, mrconf, curr_filelist_fname,
+                move_files_to_cd(bkpinfo, curr_filelist_fname,
                                  curr_xattr_list_fname,
                                  curr_acl_list_fname, curr_afioball_fname,
@@ -2241 +2244 @@
  * @ingroup MLarchiveGroup
  */
-int make_those_afios_phase(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int make_those_afios_phase(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ******************************************* */
@@ -2258 +2261 @@
         log_msg(1,
                 "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #else
-        res = make_afioballs_and_images_OLD(bkpinfo, mrconf);
+        res = make_afioballs_and_images_OLD(bkpinfo);
 #endif
         write_header_block_to_stream((off_t)0, "stop-afioballs",
                                      BLK_STOP_AFIOBALLS);
     } else {
-        res = make_afioballs_and_images(bkpinfo, mrconf);
+        res = make_afioballs_and_images(bkpinfo);
     }
 
@@ -2371 +2374 @@
  * transfer files over the network) or leave it as is.
  */
-int (*move_files_to_cd) (struct s_bkpinfo *, struct s_mrconf *mrconf, char *, ...) =
+int (*move_files_to_cd) (struct s_bkpinfo *, char *, ...) =
     _move_files_to_cd;
 
@@ -2392 +2395 @@
  * @return The number of errors encountered (0 for success)
  */
-int _move_files_to_cd(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *files_to_add, ...)
+int _move_files_to_cd(struct s_bkpinfo *bkpinfo, char *files_to_add, ...)
 {
 
@@ -2431 +2434 @@
     if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
         /* FALSE because this is not the last CD we'll write */
-        res = write_iso_and_go_on(bkpinfo, mrconf, FALSE);
+        res = write_iso_and_go_on(bkpinfo, FALSE);
         retval += res;
         if (res) {
@@ -2823 +2826 @@
 
     asprintf(&szmsg, "I am about to burn %s #%d",
-             media_descriptor_string(g_backup_media_type),
+             g_backup_media_string,
              g_current_media_number);
     log_to_screen(szmsg);
@@ -2860 +2863 @@
             log_to_screen
                 ("%s has data on it but it's probably not a Mondo CD.",
-                 media_descriptor_string(g_backup_media_type));
+                 g_backup_media_string);
             asprintf(&our_serial_str, "%s", "");
         } else {
             log_to_screen("%s found in drive. It's a Mondo disk.",
-                          media_descriptor_string(g_backup_media_type));
+                          g_backup_media_string);
             tmp1 = last_line_of_file(szcdno);
             cd_number = atoi(tmp1);
@@ -2885 +2888 @@
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
             log_msg(2, "This %s is part of this backup set!",
-                    media_descriptor_string(g_backup_media_type));
+                    g_backup_media_string);
             ok_go_ahead_burn_it = FALSE;
             if (cd_number == g_current_media_number - 1) {
                 log_to_screen
                     ("I think you've left the previous %s in the drive.",
-                     media_descriptor_string(g_backup_media_type));
+                     g_backup_media_string);
             } else {
                 log_to_screen
                     ("Please remove this %s. It is part of the backup set you're making now.",
-                     media_descriptor_string(g_backup_media_type));
+                     g_backup_media_string);
             }
         } else {
@@ -2903 +2906 @@
         log_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?",
-                media_descriptor_string(g_backup_media_type));
+                g_backup_media_string);
         if ((cdrw_device = interrogate_disk_currently_in_cdrw_drive(cdrw_device)) != NULL) {
             ok_go_ahead_burn_it = FALSE;
             log_to_screen("There isn't a writable %s in the drive.",
-                          media_descriptor_string(g_backup_media_type));
+                          g_backup_media_string);
         }
         paranoid_free(cdrw_device);
@@ -2917 +2920 @@
         asprintf(&tmp,
                  "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
-                 media_descriptor_string(g_backup_media_type),
+                 g_backup_media_string,
                  g_current_media_number,
-                 media_descriptor_string(g_backup_media_type));
+                 g_backup_media_string);
         popup_and_OK(tmp);
         paranoid_free(tmp);
@@ -2930 +2933 @@
     log_msg(2,
             "paafcd: OK, I assume I have a blank/reusable %s in the drive...",
-            media_descriptor_string(g_backup_media_type));
+            g_backup_media_string);
 
     log_to_screen("Proceeding w/ %s in drive.",
-                  media_descriptor_string(g_backup_media_type));
+                  g_backup_media_string);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2994 +2997 @@
  */
 int
-slice_up_file_etc(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, char *biggie_filename,
+slice_up_file_etc(struct s_bkpinfo *bkpinfo, char *biggie_filename,
                   char *ntfsprog_fifo, long biggie_file_number,
                   long noof_biggie_files, bool use_ntfsprog)
@@ -3092 +3095 @@
     }
     lstat(biggie_filename, &biggiestruct.properties);
-    strcpy(biggiestruct.filename, biggie_filename);
+    if (strlen(checksum_line) <= MAX_STR_LEN) {
+        strcpy(biggiestruct.filename, biggie_filename);
+    } else {
+        fatal_error("biggie_filename too big");
+    }
     pB = strchr(checksum_line, ' ');
     if (!pB) {
@@ -3100 +3107 @@
         *pB = '\0';
     }
-    strcpy(biggiestruct.checksum, checksum_line);
+    if (strlen(checksum_line) <= 64) {
+        strcpy(biggiestruct.checksum, checksum_line);
+    } else {
+        fatal_error("checksum_line too big");
+    }
     paranoid_free(checksum_line);
 
@@ -3125 +3136 @@
         res = move_files_to_stream(bkpinfo,tmp,NULL);
     } else {
-        res = move_files_to_cd(bkpinfo, mrconf, tmp, NULL);
+        res = move_files_to_cd(bkpinfo, tmp, NULL);
     }
     paranoid_free(tmp);
@@ -3131 +3142 @@
     for (slice_num = 1; !finished; slice_num++) {
         curr_slice_fname_uncompressed = slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, "");
-        curr_slice_fname_compressed = slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
+        curr_slice_fname_compressed = slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix);
 
         tmp = percent_media_full_comment(bkpinfo);
@@ -3236 +3247 @@
             res = move_files_to_stream(bkpinfo, file_to_archive, NULL);
         } else {
-            res = move_files_to_cd(bkpinfo, mrconf, file_to_archive, NULL);
+            res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
         }
         paranoid_free(file_to_archive);
@@ -3332 +3343 @@
  * however, this occurs rarely.
  */
-int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf)
+int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo)
 {
     /*@ int ***************************************************** */
@@ -3355 +3366 @@
 #endif
     paranoid_free(tmp);
-    res = write_iso_and_go_on(bkpinfo, mrconf, TRUE);
+    res = write_iso_and_go_on(bkpinfo, TRUE);
 #ifndef _XWIN
     if (!g_text_mode) {
@@ -3383 +3394 @@
  * @see make_iso_fs
  */
-int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, struct s_mrconf *mrconf, bool last_cd)
+int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd)
 {
     /*@ pointers **************************************************** */
@@ -3414 +3425 @@
     }
     log_msg(1, "OK, time to make %s #%d",
-            media_descriptor_string(bkpinfo->backup_media_type),
+            bkpinfo->backup_media_string,
             g_current_media_number);
 
@@ -3461 +3472 @@
              g_current_media_number);
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
-        res = make_iso_fs(bkpinfo, mrconf, isofile);
+        res = make_iso_fs(bkpinfo, isofile);
         if (g_current_media_number == 1 && !res
             && (bkpinfo->backup_media_type == cdr
@@ -3478 +3489 @@
             log_to_screen
                 ("Please reboot from the 1st %s in Compare Mode, as a precaution.",
-                 media_descriptor_string(g_backup_media_type));
+                 g_backup_media_string);
             chdir("/");
             iamhere("Before calling verify_cd_image()");
@@ -3488 +3499 @@
         } else {
             asprintf(&tmp, "Failed to burn %s #%d. Retry?",
-                     media_descriptor_string(bkpinfo->backup_media_type),
+                     bkpinfo->backup_media_string,
                      g_current_media_number);
             res = ask_me_yes_or_no(tmp);
@@ -3577 +3588 @@
         g_current_media_number = cdno;
         if (bkpinfo->backup_media_type != iso) {
-            bkpinfo->media_device = find_cdrom_device(FALSE));
+            bkpinfo->media_device = find_cdrom_device(FALSE);
         }
         chdir("/");
@@ -3595 +3606 @@
                 asprintf(&tmp,
                          "Warnings/errors were reported while checking %s #%d",
-                         media_descriptor_string(bkpinfo->
-                                                 backup_media_type),
+                         bkpinfo->backup_media_string,
                          g_current_media_number);
                 log_to_screen(tmp);
@@ -3745 +3755 @@
 }
 
-void mrarchive_init_conf(struct s_mrconf *mrconf) {
+void mr_archive_init_conf(struct s_mr_conf *mr_conf) {
     char *command = NULL;
-    FILE *conffd = NULL;
     FILE *fin = NULL;
-    int n = 0;
+    size_t n = 0;
     char *param = NULL;
 
-    mrconf = (struct s_mrconf *)malloc(sizeof(struct s_mrconf));
-    if (mrconf == NULL) {
-            fatal_error("Unable to malloc mrconf");
+    mr_conf = (struct s_mr_conf *)malloc(sizeof(struct s_mr_conf));
+    if (mr_conf == NULL) {
+            fatal_error("Unable to malloc mr_conf");
     }
     /* Default for everything int : 0 char * : NULL */
 
     /* mindi conf parameters also needed in mondo */
-    mrconf->ia64_boot_size = 0;
+    mr_conf->mindi_ia64_boot_size = 0;
 
     asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
@@ -3766 +3775 @@
     pclose(fin);
     paranoid_free(command);
-    mrconf->ia64_boot_size = atoi(param);
+    mr_conf->mindi_ia64_boot_size = atoi(param);
     paranoid_free(param);
 
-    mrconf->iso_creation_cmd = NULL;
+    mr_conf->mondo_iso_creation_cmd = NULL;
 
     /* Finds mondo conf file */
-    mrconf_open(MONDO_CONF_DIR"/mondo.conf");
+    mr_conf_open(MONDO_CONF_DIR"/mondo.conf");
 
     /* mondo conf parameters needed */
-    mrconf->iso_creation_cmd = mrconf_sread(iso_creation_cmd);
-
-    mrconf_close();
+    mr_conf->mondo_iso_creation_cmd = mr_conf_sread("mondo_iso_creation_cmd");
+
+    mr_conf_close();
+}