Changeset 3194 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c
- Timestamp:
- Sep 29, 2013, 7:27:11 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-devices.c
r3191 r3194 884 884 if (!tmp[0]) { 885 885 mr_free(tmp); 886 mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));886 mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1")); 887 887 } 888 888 if (tmp[0]) { … … 2400 2400 2401 2401 /* Initiate bkpinfo netfs_mount path from running environment if not already done */ 2402 if ( !bkpinfo->netfs_mount == NULL) {2403 mr_asprintf(bkpinfo->netfs_mount, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));2402 if (bkpinfo->netfs_mount == NULL) { 2403 mr_asprintf(bkpinfo->netfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1")); 2404 2404 } 2405 2405 #ifdef __FreeBSD__ … … 2417 2417 } 2418 2418 mr_free(bkpinfo->netfs_mount); 2419 mr_asprintf(bkpinfo->netfs_mount, "%s", p ;2419 mr_asprintf(bkpinfo->netfs_mount, "%s", p); 2420 2420 if (!bkpinfo->restore_data) { 2421 2421 if ((compression_type = which_compression_type()) == NULL) { … … 2448 2448 2449 2449 if (!bkpinfo->restore_data) { 2450 mr_ sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB2450 mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB 2451 2451 mr_asprintf(comment, "How much data (in Megabytes) will each media store?"); 2452 2452 strcpy(tmp1, sz_size); … … 2496 2496 strcpy(tmp1, ""); 2497 2497 } 2498 if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1 )) {2498 if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1, MAX_STR_LEN)) { 2499 2499 log_to_screen("User has chosen not to backup the PC"); 2500 2500 finish(1); … … 2556 2556 finish(1); 2557 2557 } 2558 strcpy(bkpinfo->netfs_remote_dir, tmp1);2558 mr_asprintf(bkpinfo->netfs_remote_dir, "%s", tmp1); 2559 2559 2560 2560 // check whether writable - we better remove surrounding spaces for this 2561 strip_spaces(bkpinfo->netfs_remote_dir);2561 mr_strip_spaces(bkpinfo->netfs_remote_dir); 2562 2562 2563 2563 if (!popup_and_get_string … … 2820 2820 2821 2821 /* Handle devices passed in bkpinfo and print result */ 2822 /* the mr_make_devlist_from_pathlist function appends 2822 /* the mr_make_devlist_from_pathlist function appends */ 2823 2823 /* to the *_paths variables so copy before */ 2824 2824 mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
Note:
See TracChangeset
for help on using the changeset viewer.