Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (17 diffs)

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -162 +162 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 /* Should we use or not extended attributes and acl when restoring */
 char *g_getfattr = NULL;
@@ -285 +288 @@
 */
 int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
-                         char *ramdisk_fname,
+extract_config_file_from_ramdisk(char *ramdisk_fname,
                          char *output_cfg_file,
                          char *output_mountlist_file)
@@ -354 +356 @@
 /**
 * Keep trying to get mondo-restore.cfg from the archive, until the user gives up.
-* @param bkpinfo The backup information structure.
 */
-void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *bkpinfo)
-{
-while (get_cfg_file_from_archive(bkpinfo)) {
+void get_cfg_file_from_archive_or_bust()
+{
+while (get_cfg_file_from_archive()) {
 if (!ask_me_yes_or_no
     ("Failed to find config file/archives. Choose another source?"))
@@ -364 +365 @@
     fatal_error("Could not find config file/archives. Aborting.");
 }
-interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+interactively_obtain_media_parameters_from_user(FALSE);
 }
 }
@@ -432 +433 @@
 * @return 0 for success, nonzero for failure.
 */
-int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please)
+int iso_fiddly_bits(bool nuke_me_please)
 {
 char *mount_isodir_command, *tmp, *command;
@@ -488 +489 @@
 }
 if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-mount_cdrom(bkpinfo);
-}
-i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
+mount_cdrom();
+}
+i = what_number_cd_is_this();   /* has the side-effect of calling mount_cdrom() */
 sprintf(tmp, "%s #%d has been mounted via loopback mount",
     media_descriptor_string(bkpinfo->backup_media_type), i);
@@ -637 +638 @@
 * @return 0 for success, nonzero for failure.
 */
-int mount_cdrom(struct s_bkpinfo *bkpinfo)
+int mount_cdrom()
 {
 char *mount_cmd;
@@ -906 +907 @@
 * @return 0 for success, nonzero for failure.
 */
-int read_cfg_file_into_bkpinfo(char *cfgf, struct s_bkpinfo *bkpinfo)
+int read_cfg_file_into_bkpinfo(char *cfgf)
 {
 /** add mallocs **/
@@ -1188 +1189 @@
             strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
             bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
-            if (mount_cdrom(bkpinfo)) {
+            if (mount_cdrom()) {
                 fatal_error
                     ("Unable to mount isodir. Failed to mount CD-ROM as well.");
@@ -1209 +1210 @@
         log_msg(2,
                 "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
-        interactively_obtain_media_parameters_from_user(bkpinfo,
-                                                        FALSE);
+        interactively_obtain_media_parameters_from_user(FALSE);
         media_specified_by_user = bkpinfo->backup_media_type;
-        get_cfg_file_from_archive(bkpinfo);
+        get_cfg_file_from_archive();
 /*
       if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
@@ -1250 +1250 @@
 */
 struct
-s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
+s_node *process_filelist_and_biggielist()
 {
 struct s_node *filelist;
@@ -1293 +1293 @@
             "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
             bkpinfo->isodir);
-    insist_on_this_cd_number(bkpinfo, 1);
+    insist_on_this_cd_number(1);
     log_msg(2, "Back from iotcn");
     run_program_and_log_output("mount", 1);
@@ -1989 +1989 @@
  * - @c bkpinfo->disaster_recovery
  */
-void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo)
+void setup_MR_global_filenames()
 {
     char *temppath;
@@ -2292 +2292 @@
  * @return 0 for success, nonzero for failure.
  */
-int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo)
+int get_cfg_file_from_archive()
 {
     int retval = 0;
@@ -2379 +2379 @@
                     "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
         }
-        if (extract_config_file_from_ramdisk
-            (bkpinfo, ramdisk_fname, cfg_file, mountlist_file)) {
+        if (extract_config_file_from_ramdisk(ramdisk_fname, cfg_file, mountlist_file)) {
             log_msg(2,
                     "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
@@ -2394 +2393 @@
         } else {
             log_msg(2, "gcffa --- calling mount_cdrom now :)");
-            if (!mount_cdrom(bkpinfo)) {
+            if (!mount_cdrom()) {
                 log_msg(2,
                         "gcffa --- managed to mount CD; so, no need for Plan B");
@@ -2401 +2400 @@
                 try_plan_B = TRUE;
             }
-            if (what_number_cd_is_this(bkpinfo) > 1) {
-                insist_on_this_cd_number(bkpinfo,
-                                         (g_current_media_number = 1));
+            if (what_number_cd_is_this() > 1) {
+                insist_on_this_cd_number((g_current_media_number = 1));
             }
         }