Changeset 1166 in MondoRescue for branches/stable/mondo
- Timestamp:
- Feb 14, 2007, 11:33:50 PM (17 years ago)
- Location:
- branches/stable/mondo/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-devices.c
r1156 r1166 41 41 42 42 extern bool g_ISO_restore_mode; 43 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;44 43 extern char *g_erase_tmpdir_and_scratchdir; 45 44 extern char *g_selfmounted_isodir; -
branches/stable/mondo/src/common/libmondo-mountlist.c
r1147 r1166 22 22 /*@unused@*/ 23 23 //static char cvsid[] = "$Id$"; 24 25 /**26 * A global copy of @c bkpinfo, to aid in debugging. As the name implies, <em>don't use this</em>.27 * @ingroup globalGroup28 */29 struct s_bkpinfo *g_bkpinfo_DONTUSETHIS = NULL;30 24 31 25 /** -
branches/stable/mondo/src/include/my-stuff.h
r1158 r1166 271 271 * Free variables and call finish(@p x). 272 272 */ 273 #define paranoid_MR_finish(x) {free_MR_global_filenames (); if ( g_bkpinfo_DONTUSETHIS) mr_free (g_bkpinfo_DONTUSETHIS); finish(x); }273 #define paranoid_MR_finish(x) {free_MR_global_filenames (); if (bkpinfo) mr_free (bkpinfo); finish(x); } 274 274 275 275 /** -
branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h
r425 r1166 12 12 extern char *g_isodir_format; 13 13 14 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;15 14 extern char *g_biggielist_txt; 16 15 extern char *g_filelist_full; … … 54 53 long, char *, long long, 55 54 struct s_node *); 56 extern int restore_a_tarball_from_CD(char *, int, struct s_node * );55 extern int restore_a_tarball_from_CD(char *, int, struct s_node *, struct s_bkpinfo *); 57 56 extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int, 58 57 struct s_node *, long long); -
branches/stable/mondo/src/mondorestore/mondo-restore.c
r1125 r1166 38 38 **************************************************************************/ 39 39 extern char *g_tmpfs_mountpt; // declared in libmondo-tools.c 40 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS; // used by finish() to free41 // up global bkpinfo struct42 40 extern bool g_text_mode; 43 41 extern FILE *g_fprep; … … 1580 1578 restore_a_tarball_from_CD(char *tarball_fname, 1581 1579 long current_tarball_number, 1582 struct s_node *filelist )1580 struct s_node *filelist, struct s_bkpinfo *) 1583 1581 { 1584 1582 int retval = 0; … … 2251 2249 restore_a_tarball_from_CD(tarball_fname, 2252 2250 current_tarball_number, 2253 filelist );2251 filelist, bkpinfo); 2254 2252 } 2255 2253 sprintf(tmp, "%s #%d, fileset #%ld - restore ", … … 2911 2909 g_text_mode = FALSE; 2912 2910 } // newt :-) 2913 bkpinfo = g_bkpinfo_DONTUSETHIS =mr_malloc(sizeof(struct s_bkpinfo));2911 bkpinfo = mr_malloc(sizeof(struct s_bkpinfo)); 2914 2912 mountlist = mr_malloc(sizeof(struct mountlist_itself)); 2915 2913 raidlist = mr_malloc(sizeof(struct raidlist_itself)); -
branches/stable/mondo/src/mondorestore/mondo-restore.h
r128 r1166 27 27 char *, long long, struct s_node *, 28 28 int, char *); 29 int restore_a_tarball_from_CD(char *, long, struct s_node * );29 int restore_a_tarball_from_CD(char *, long, struct s_node *, struct s_bkpinfo *); 30 30 int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long, 31 31 struct s_node *, long long, char *, -
branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
r1125 r1166 37 37 extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored 38 38 extern char *g_mondo_home; // homedir of Mondo; usually /usr/local/share/mondo 39 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;40 39 41 40 extern t_bkptype g_backup_media_type; … … 2018 2017 log_to_screen 2019 2018 ("Mondorestore is terminating in response to a signal from the OS"); 2020 paranoid_MR_finish(254); 2019 free_MR_global_filenames(); 2020 finish(254); 2021 2021 } 2022 2022
Note:
See TracChangeset
for help on using the changeset viewer.