Changeset 783 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Aug 31, 2006, 5:09:20 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r764 r783 5 5 #include <unistd.h> 6 6 7 #include " ../common/my-stuff.h"7 #include "my-stuff.h" 8 8 #include "../common/mondostructures.h" 9 9 #include "../common/libmondo.h" … … 39 39 40 40 extern t_bkptype g_backup_media_type; 41 extern char *g_backup_media_string; 41 42 42 43 extern int g_partition_table_locked_up; … … 290 291 assert(bkpinfo != NULL); 291 292 g_ISO_restore_mode = TRUE; 293 294 paranoid_free(g_isodir_device); 292 295 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device); 293 296 if (bkpinfo->disaster_recovery) { 294 297 /* Patch Conor Daly 26-june-2004 295 298 * Don't let this clobber an existing bkpinfo->isodir */ 296 if (!bkpinfo->isodir [0]) {297 strcpy(bkpinfo->isodir, "/tmp/isodir");299 if (!bkpinfo->isodir) { 300 paranoid_alloc(bkpinfo->isodir, "/tmp/isodir"); 298 301 } 299 302 /* End patch */ … … 344 347 i = what_number_cd_is_this(bkpinfo); /* has the side-effect of calling mount_cdrom() */ 345 348 asprintf(&tmp, "%s #%d has been mounted via loopback mount", 346 media_descriptor_string(bkpinfo->backup_media_type), i);349 bkpinfo->backup_media_string, i); 347 350 log_msg(1, tmp); 348 351 paranoid_free(tmp); … … 497 500 { 498 501 char *mount_cmd = NULL; 499 char *tmp = NULL;500 502 int i, res; 501 503 #ifdef __FreeBSD__ … … 519 521 log_msg(2, "Mounting for NFS thingy"); 520 522 log_msg(2, "isodir = %s", bkpinfo->isodir); 521 if ((!bkpinfo->isodir [0]|| !strcmp(bkpinfo->isodir, "/"))523 if ((!bkpinfo->isodir || !strcmp(bkpinfo->isodir, "/")) 522 524 && am_I_in_disaster_recovery_mode()) { 523 strcpy(bkpinfo->isodir, "/tmp/isodir");525 paranoid_alloc(bkpinfo->isodir, "/tmp/isodir"); 524 526 log_msg(1, "isodir is being set to %s", bkpinfo->isodir); 525 527 } … … 663 665 asprintf(&p2, ",user_xattr"); 664 666 } else { 665 asprintf(&p2, " ");667 asprintf(&p2, "%s", ""); 666 668 } 667 669 paranoid_free(tmp); … … 671 673 asprintf(&p3, ",acl"); 672 674 } else { 673 asprintf(&p3, " ");675 asprintf(&p3, "%s", ""); 674 676 } 675 677 paranoid_free(tmp); … … 789 791 char *value = NULL; 790 792 char *tmp = NULL; 793 char *tmp1 = NULL; 791 794 char *command = NULL; 792 795 char *iso_mnt = NULL; … … 836 839 837 840 if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) { 838 paranoid_free(bkpinfo->prefix); 839 bkpinfo->prefix = value; 841 paranoid_alloc(bkpinfo->prefix,value); 840 842 } else { 841 843 paranoid_alloc(bkpinfo->prefix, STD_PREFIX); … … 845 847 paranoid_free(value); 846 848 if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) { 847 paranoid_free(bkpinfo->prefix); 848 bkpinfo->prefix = value; 849 paranoid_alloc(bkpinfo->prefix,value); 849 850 } else { 850 851 paranoid_alloc(bkpinfo->prefix, STD_PREFIX); … … 869 870 } else if (bkpinfo->backup_media_type == tape 870 871 || bkpinfo->backup_media_type == udev) { 872 paranoid_free(bkpinfo->media_device); 871 873 if (read_cfg_var(cfg_file, "media-dev", bkpinfo->media_device)) { 872 874 fatal_error("Cannot get tape device name from cfg file"); … … 964 966 "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place"); 965 967 } else { 968 paranoid_free(bkpinfo->nfs_mount); 969 paranoid_free(bkpinfo->nfs_remote_dir); 966 970 read_cfg_var(g_mondo_cfg_file, "nfs-server-mount", 967 971 bkpinfo->nfs_mount); … … 976 980 * isodir in disaster recovery mode 977 981 */ 978 old_isodir = bkpinfo->isodir;982 paranoid_alloc(old_isodir,bkpinfo->isodir); 979 983 read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt); 980 984 read_cfg_var(g_mondo_cfg_file, "isodir", iso_path); 981 985 if (iso_mnt && iso_path) { 986 paranoid_free(bkpinfo->isodir); 982 987 asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path); 983 } else {984 bkpinfo->isodir = old_isodir;985 988 } 986 989 paranoid_free(iso_mnt); … … 992 995 ("user nominated isodir differs from archive, keeping user's choice: %s %s\n", 993 996 old_isodir, bkpinfo->isodir); 994 if (bkpinfo->isodir != old_isodir) { 995 paranoid_free(old_isodir); 996 } 997 } else { 998 paranoid_free(old_isodir); 999 } 1000 } 1001 997 } 998 } 999 paranoid_free(old_isodir); 1000 1001 paranoid_free(g_isodir_device); 1002 1002 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device); 1003 1003 log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device); … … 1029 1029 paranoid_free(iso_mnt); 1030 1030 paranoid_free(iso_path); 1031 asprintf(&iso_mnt, " ");1032 asprintf(&iso_path, " ");1031 asprintf(&iso_mnt, "%s", ""); 1032 asprintf(&iso_path, "%s", ""); 1033 1033 1034 1034 if (mount_cdrom(bkpinfo)) { … … 1069 1069 } 1070 1070 g_backup_media_type = bkpinfo->backup_media_type; 1071 bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type); 1072 g_backup_media_string = bkpinfo->backup_media_string; 1071 1073 return (0); 1072 1074 } … … 1823 1825 assert(bkpinfo != NULL); 1824 1826 1825 malloc_string(g_tmpfs_mountpt);1826 1827 1827 asprintf(&g_biggielist_txt, "%s/%s",bkpinfo->tmpdir , BIGGIELIST_TXT_STUB); 1828 1828 asprintf(&g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB); … … 1830 1830 asprintf(&g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these", 1831 1831 bkpinfo->tmpdir); 1832 paranoid_free(g_mondo_cfg_file); 1833 paranoid_free(g_mountlist_fname); 1832 1834 if (bkpinfo->disaster_recovery) { 1833 1835 asprintf(&g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB); … … 2110 2112 { 2111 2113 int retval = 0; 2112 char *device = NULL;2113 2114 char *command = NULL; 2114 2115 char *cfg_file = NULL; … … 2364 2365 2365 2366 g_backup_media_type = bkpinfo->backup_media_type; 2367 bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type); 2368 g_backup_media_string = bkpinfo->backup_media_string; 2366 2369 return (retval); 2367 2370 }
Note:
See TracChangeset
for help on using the changeset viewer.