Changeset 1663 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (17 diffs)

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

@@ -49 +49 @@
 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;
@@ -141 +144 @@
  */
 int
-extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
-                                 char *ramdisk_fname,
-                                 char *output_cfg_file,
-                                 char *output_mountlist_file)
+extract_config_file_from_ramdisk(char *ramdisk_fname,
+                         char *output_cfg_file,
+                         char *output_mountlist_file)
 {
     char *mountpt = NULL;
@@ -211 +213 @@
 /**
  * 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
             (_
@@ -222 +223 @@
             fatal_error("Could not find config file/archives. Aborting.");
         }
-        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+        interactively_obtain_media_parameters_from_user(FALSE);
     }
 }
@@ -285 +286 @@
  * @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 = NULL;
@@ -341 +342 @@
     }
     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() */
     mr_msg(1, "%s #%d has been mounted via loopback mount",
             bkpinfo->backup_media_string, i);
@@ -601 +602 @@
  * @return 0 for success, nonzero for failure.
  */
-int mount_cdrom(struct s_bkpinfo *bkpinfo)
+int mount_cdrom()
 {
     char *mount_cmd = NULL;
@@ -750 +751 @@
  * @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)
 {
     char *value = NULL;
@@ -1019 +1020 @@
                     mr_asprintf(&iso_mnt, "");
                     mr_asprintf(&iso_path, "");
-                    if (mount_cdrom(bkpinfo)) {
+                    if (mount_cdrom()) {
                         fatal_error
                             ("Unable to mount isodir. Failed to mount CD-ROM as well.");
@@ -1043 +1044 @@
                 mr_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();
             }
         }
@@ -1072 +1073 @@
  */
 struct
-s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
+s_node *process_filelist_and_biggielist()
 {
     struct s_node *filelist = NULL;
@@ -1115 +1116 @@
                     "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
                     bkpinfo->isodir);
-            insist_on_this_cd_number(bkpinfo, 1);
+            insist_on_this_cd_number(1);
             mr_msg(2, "Back from iotcn");
             run_program_and_log_output("mount", 1);
@@ -1125 +1126 @@
                     FILELIST_FULL_STUB,
                     "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
-
             mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1790 +1790 @@
  * - @c bkpinfo->disaster_recovery
  */
-void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo)
+void setup_MR_global_filenames()
 {
     char *temppath;
@@ -2081 +2081 @@
  * @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;
@@ -2125 +2125 @@
         } else {
             mr_msg(2, "gcffa --- calling mount_cdrom now :)");
-            if (!mount_cdrom(bkpinfo)) {
+            if (!mount_cdrom()) {
                 mr_msg(2,
                         "gcffa --- managed to mount CD; so, no need for Plan B");
@@ -2132 +2132 @@
                 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));
             }
         }