Changeset 2009 in MondoRescue for trunk/mondo/src/mondoarchive/mondo-cli.c
- Timestamp:
- Aug 11, 2008, 3:05:15 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/mondoarchive/mondo-cli.c
r1188 r2009 140 140 { 141 141 int j; 142 char *tmp; 143 char *p; 144 char *q; 145 char *comment; 142 char *tmp = NULL; 143 char *p = NULL; 144 char *q = NULL; 146 145 147 146 assert(bkpinfo != NULL); … … 159 158 mr_free(tmp); 160 159 161 mr_ asprintf(&comment, "media_size[%d] = %ld", j,160 mr_msg(3, "media_size[%d] = %ld", j, 162 161 bkpinfo->media_size[j]); 163 mr_msg(3, comment);164 mr_free(comment);165 162 } 166 163 for (; j <= MAX_NOOF_MEDIA; j++) { … … 201 198 char *tmp = NULL; 202 199 char *tmp1 = NULL; 200 char *tmp2 = NULL; 203 201 char *psz = NULL; 204 202 char *p = NULL; … … 398 396 mr_free(tmp); // allocation from find_tape_device_and_size 399 397 400 mr_asprintf(&tmp ,398 mr_asprintf(&tmp2, 401 399 _("You didn't specify a tape streamer device. I'm assuming %s"), 402 400 flag_val['d']); 403 log_to_screen(tmp );404 mr_free(tmp );401 log_to_screen(tmp2); 402 mr_free(tmp2); 405 403 percent = 0; 406 404 } … … 481 479 mr_allocstr(bkpinfo->nfs_remote_dir,"/"); 482 480 } 483 mr_asprintf(&tmp , "mount | grep -E '^%s .*$' | cut -d' ' -f3",481 mr_asprintf(&tmp2, "mount | grep -E '^%s .*$' | cut -d' ' -f3", 484 482 bkpinfo->nfs_mount); 485 483 mr_free(bkpinfo->isodir); 486 bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp );487 mr_free(tmp );484 bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp2); 485 mr_free(tmp2); 488 486 489 487 if (strlen(bkpinfo->isodir) < 3) { … … 642 640 if (!does_file_exist(bkpinfo->kernel_path)) { 643 641 retval++; 644 mr_asprintf(&tmp ,642 mr_asprintf(&tmp2, 645 643 _("You specified kernel '%s', which does not exist\n"), 646 644 bkpinfo->kernel_path); 647 log_to_screen(tmp );648 mr_free(tmp );645 log_to_screen(tmp2); 646 mr_free(tmp2); 649 647 } 650 648 } else { … … 660 658 if (flag_set['i']) { 661 659 mr_allocstr(bkpinfo->isodir,flag_val['d']); 662 mr_asprintf(&tmp , "ls -l %s", bkpinfo->isodir);663 if (run_program_and_log_output(tmp , FALSE)) {660 mr_asprintf(&tmp2, "ls -l %s", bkpinfo->isodir); 661 if (run_program_and_log_output(tmp2, FALSE)) { 664 662 fatal_error 665 663 ("output folder does not exist - please create it"); 666 664 } 667 mr_free(tmp );665 mr_free(tmp2); 668 666 } else if (flag_set['n']) { 669 667 mr_allocstr(bkpinfo->nfs_remote_dir,flag_val['d']); … … 674 672 675 673 if (flag_set['n']) { 676 mr_asprintf(&tmp , "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,674 mr_asprintf(&tmp2, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir, 677 675 bkpinfo->nfs_remote_dir); 678 if (run_program_and_log_output(tmp , FALSE)) {676 if (run_program_and_log_output(tmp2, FALSE)) { 679 677 retval++; 680 mr_free(tmp );681 mr_asprintf(&tmp ,678 mr_free(tmp2); 679 mr_asprintf(&tmp2, 682 680 _("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n"), 683 681 bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount); 684 log_to_screen(tmp );685 } 686 mr_free(tmp );682 log_to_screen(tmp2); 683 } 684 mr_free(tmp2); 687 685 } 688 686 … … 730 728 mr_free(bkpinfo->tmpdir); 731 729 bkpinfo->tmpdir = tmp; 732 mr_asprintf(&tmp , "touch %s/.foo.dat", flag_val['T']);733 if (run_program_and_log_output(tmp , 1)) {730 mr_asprintf(&tmp2, "touch %s/.foo.dat", flag_val['T']); 731 if (run_program_and_log_output(tmp2, 1)) { 734 732 retval++; 735 733 log_to_screen … … 737 735 fatal_error("I cannot write to the tempdir you specified."); 738 736 } 739 mr_free(tmp );740 741 mr_asprintf(&tmp , "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],737 mr_free(tmp2); 738 739 mr_asprintf(&tmp2, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'], 742 740 flag_val['T']); 743 if (run_program_and_log_output(tmp , 1)) {741 if (run_program_and_log_output(tmp2, 1)) { 744 742 retval++; 745 743 log_to_screen … … 747 745 fatal_error("I cannot write to the tempdir you specified."); 748 746 } 749 mr_free(tmp );747 mr_free(tmp2); 750 748 } 751 749 … … 788 786 mr_allocstr(bkpinfo->boot_device,tmp); 789 787 } 788 790 789 if (flag_set['Q']) { 791 if (tmp == NULL) { 792 printf("-f option required when using -Q\n"); 793 finish(-1); 794 } 795 i = which_boot_loader(tmp); 796 mr_msg(3, "boot loader is %c, residing at %s", i, tmp); 797 printf(_("boot loader is %c, residing at %s\n"), i, tmp); 798 mr_free(tmp); 790 if (bkpinfo->boot_device == NULL) { 791 fatal_error("-f option required when using -Q\n"); 792 } 793 i = which_boot_loader(bkpinfo->boot_device); 794 mr_msg(3, "boot loader is %c, residing at %s", i, bkpinfo->boot_device); 795 log_to_screen(_("boot loader is %c, residing at %s\n"), i, tmp); 799 796 finish(0); 800 797 } 801 mr_free(tmp);802 798 803 799 if (flag_set['P']) { … … 880 876 return (retval); 881 877 } 882 883 878 884 879 … … 901 896 /*@ ints ** */ 902 897 int opt = 0; 903 char *tmp ;898 char *tmp = NULL; 904 899 int i = 0; 905 int len ;900 int len = 0; 906 901 907 902 /*@ bools *** */ … … 965 960 966 961 967 968 969 962 /** 970 963 * Print a not-so-helpful help message and exit. 971 964 */ 972 void help_screen( )965 void help_screen(void) 973 966 { 974 967 mr_msg(1, "Type 'man mondo-archive' for more information\n"); … … 983 976 void terminate_daemon(int sig) 984 977 { 985 char *tmp ;986 char *tmp2 ;978 char *tmp = NULL; 979 char *tmp2 = NULL; 987 980 988 981 switch (sig) {
Note:
See TracChangeset
for help on using the changeset viewer.