Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c
- Timestamp:
- Aug 18, 2009, 3:13:54 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-cli.c
r2323 r2324 111 111 for (i = 0; i < 128; i++) { 112 112 if (flag_set[i]) { 113 mr_asprintf(tmp, "-%c %s", i, flag_val[i]); 114 log_msg(3, tmp); 115 mr_free(tmp); 113 log_msg(3, "-%c %s", i, flag_val[i]); 116 114 } 117 115 } … … 150 148 int j; 151 149 char tmp[MAX_STR_LEN], *p; 152 char *comment = NULL;153 150 154 151 assert(bkpinfo != NULL); … … 161 158 *(strchr(tmp, ',')) = '\0'; 162 159 bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp); 163 mr_asprintf(comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]); 164 log_msg(3, comment); 165 mr_free(comment); 160 log_msg(3, "media_size[%d] = %ld", j, bkpinfo->media_size[j]); 166 161 } 167 162 for (; j <= MAX_NOOF_MEDIA; j++) { … … 837 832 } 838 833 bkpinfo->make_filelist = FALSE; 839 mr_asprintf(p, "%s", flag_val['J']); 840 mr_free(bkpinfo->include_paths); 841 bkpinfo->include_paths = p; 834 mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']); 842 835 } 843 836 … … 878 871 log_msg(3, "flag_val['c'] = %s", flag_val['c']); 879 872 log_msg(3, "flag_val['w'] = %s", flag_val['w']); 880 //log_msg(3, "flag_set['r'] = %i", flag_set['r'] );873 // log_msg(3, "flag_set['r'] = %i", flag_set['r'] ); 881 874 if (flag_set['c']) { 882 875 bkpinfo->cdrw_speed = atoi(flag_val['c']); … … 902 895 flag_set['d'] = TRUE; 903 896 strcpy(flag_val['d'], p); 904 mr_free(p); 905 mr_asprintf(tmp1, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']); 906 log_to_screen(tmp1); 907 mr_free(tmp1); 897 log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']); 908 898 percent = 0; 909 899 } … … 1004 994 p--; 1005 995 *p = '\0'; 1006 mr_asprintf(q,"%s",bkpinfo->nfs_mount); 1007 bkpinfo->nfs_user = q; 996 mr_asprintf(bkpinfo->nfs_user,"%s",p); 1008 997 strcpy(bkpinfo->nfs_mount,tmp); 1009 998 } 1010 999 mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount); 1011 1000 mr_free(bkpinfo->isodir); 1012 mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1)); 1013 bkpinfo->isodir = tmp2; 1001 mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1)); 1014 1002 mr_free(tmp1); 1015 1003 … … 1025 1013 mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount); 1026 1014 mr_free(bkpinfo->isodir); 1027 mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1)); 1028 bkpinfo->isodir = tmp2; 1015 mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1)); 1029 1016 mr_free(tmp1); 1030 1017 … … 1213 1200 && !does_file_exist(bkpinfo->kernel_path)) { 1214 1201 retval++; 1215 mr_asprintf(tmp1, "You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path); 1216 log_to_screen(tmp1); 1217 mr_free(tmp1); 1202 log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path); 1218 1203 } 1219 1204 } … … 1221 1206 if (flag_set['p']) { 1222 1207 mr_free(bkpinfo->prefix); 1223 mr_asprintf(tmp1, "%s", flag_val['p']); 1224 bkpinfo->prefix = tmp1; 1208 mr_asprintf(bkpinfo->prefix, "%s", flag_val['p']); 1225 1209 log_msg(1,"Prefix forced to %s",bkpinfo->prefix); 1226 1210 } … … 1229 1213 if (flag_set['i']) { 1230 1214 mr_free(bkpinfo->isodir); 1231 mr_asprintf(tmp2, "%s", flag_val['d']); 1232 bkpinfo->isodir = tmp2; 1215 mr_asprintf(bkpinfo->isodir, "%s", flag_val['d']); 1233 1216 mr_asprintf(tmp1, "ls -l %s", bkpinfo->isodir); 1234 1217 if (run_program_and_log_output(tmp1, 2)) { … … 1256 1239 if (i) { 1257 1240 retval++; 1258 mr_asprintf(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount); 1259 log_to_screen(tmp2); 1260 mr_free(tmp2); 1241 log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount); 1261 1242 } 1262 1243 unlink(tmp1); … … 1297 1278 1298 1279 if (flag_set['S']) { 1299 mr_asprintf(tmp1, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768); 1300 mr_free(bkpinfo->scratchdir); 1301 bkpinfo->scratchdir = tmp1; 1280 mr_asprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'], random() % 32768); 1302 1281 } 1303 1282 … … 1510 1489 if (flag_set[opt]) { 1511 1490 bad_switches = TRUE; 1512 mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]); 1513 log_to_screen(tmp); 1514 mr_free(tmp); 1491 log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]); 1515 1492 } else { 1516 1493 flag_set[opt] = TRUE; … … 1526 1503 if (strchr(flag_val[opt], '/') 1527 1504 && flag_val[opt][0] != '/') { 1528 mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]); 1529 log_to_screen(tmp); 1530 mr_free(tmp); 1505 log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]); 1531 1506 bad_switches = TRUE; 1532 1507 } … … 1539 1514 for (i = optind; i < argc; i++) { 1540 1515 bad_switches = TRUE; 1541 mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]); 1542 log_to_screen(tmp); 1543 mr_free(tmp); 1516 log_to_screen("Invalid arg -- %s\n", argv[i]); 1544 1517 } 1545 1518 return (bad_switches); … … 1615 1588 free_MR_global_filenames(); 1616 1589 1617 fatal_error 1618 ("MondoRescue is terminating in response to a signal from the OS"); 1590 fatal_error("MondoRescue is terminating in response to a signal from the OS"); 1619 1591 finish(254); // just in case 1620 1592 } … … 1629 1601 void set_signals(int on) 1630 1602 { 1631 int signals[] = 1632 { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 }; 1603 int signals[] = { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 }; 1633 1604 int i; 1634 1605
Note:
See TracChangeset
for help on using the changeset viewer.