Changeset 688 in MondoRescue for trunk/mondo/mondo/mondoarchive/mondo-cli.c
- Timestamp:
- Jul 17, 2006, 3:44:46 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/mondoarchive/mondo-cli.c
r687 r688 14 14 #include <pthread.h> 15 15 #endif 16 17 //static char cvsid[] = "$Id$";18 16 19 17 extern int g_loglevel; … … 119 117 } 120 118 // } 121 asprintf(&tmp, "rm -Rf %s/ tmp.mondo.*", bkpinfo->tmpdir);119 asprintf(&tmp, "rm -Rf %s/mondo.tmp.*", bkpinfo->tmpdir); 122 120 paranoid_system(tmp); 123 121 paranoid_free(tmp); … … 127 125 paranoid_free(tmp); 128 126 129 sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld", 127 /* BERLIOS : Useless ??? 128 s-printf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/mondo.tmp.%ld", 130 129 random() % 32767); 131 s printf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),130 s-printf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir), 132 131 "/mondo.scratch.%ld", random() % 32767); 132 */ 133 133 134 134 asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir); … … 211 211 /*@ ints *** */ 212 212 int i = 0; 213 int j = 0; 213 214 int retval = 0; 214 215 int percent = 0; … … 216 217 /*@ buffers ** */ 217 218 char *tmp; 218 char *tmp2;219 219 char *tmp1; 220 220 char *psz; … … 495 495 asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3", 496 496 bkpinfo->nfs_mount); 497 asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp)); 498 bkpinfo->isodir = tmp2; 497 bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp); 499 498 paranoid_free(tmp); 500 499 … … 683 682 if (popup_and_get_string 684 683 (_("Device"), _("Please specify the device"), 685 bkpinfo->media_device , MAX_STR_LEN / 4)) {684 bkpinfo->media_device)) { 686 685 retval++; 687 686 log_to_screen(_("User opted to cancel.")); … … 711 710 } /* not '\0' but '0' */ 712 711 } 712 j = (int) random() % 32768; 713 713 if (flag_set['S']) { 714 asprintf(&tmp, "%s/mondo.scratch.%ld", flag_val['S'], 715 random() % 32768);714 asprintf(&tmp, "%s/mondo.scratch.%ld", flag_val['S'], j); 715 paranoid_free(bkpinfo->scratchdir); 716 716 bkpinfo->scratchdir = tmp; 717 717 } 718 718 if (flag_set['T']) { 719 asprintf(&tmp, "%s/ tmp.mondo.%ld", flag_val['T'],720 random() % 32768);719 asprintf(&tmp, "%s/mondo.tmp.%ld", flag_val['T'], j); 720 paranoid_free(bkpinfo->tmpdir); 721 721 bkpinfo->tmpdir = tmp; 722 722 asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']); … … 766 766 (BOOT_LOADER_CHARS, 767 767 (bkpinfo->boot_loader = flag_val['l'][0]))) { 768 log_msg(1, "%c? W TFis %c? I need G, L, E or R.",768 log_msg(1, "%c? What is %c? I need G, L, E or R.", 769 769 bkpinfo->boot_loader, bkpinfo->boot_loader); 770 770 fatal_error
Note:
See TracChangeset
for help on using the changeset viewer.