Changeset 3205 in MondoRescue for branches/3.2/mondo/src/common/libmondo-cli.c
- Timestamp:
- Dec 6, 2013, 3:40:47 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-cli.c
r3194 r3205 236 236 if (!strcmp(bkpinfo->include_paths, "/")) { 237 237 log_msg(2, "'/' is pleonastic."); 238 bkpinfo->include_paths[0] = '\0';238 mr_free(bkpinfo->include_paths); 239 239 } 240 240 if (bkpinfo->include_paths[0]) { 241 strcat(bkpinfo->include_paths, "|");241 mr_strcat(bkpinfo->include_paths, "|"); 242 242 } 243 243 … … 454 454 *p = '\0'; 455 455 } 456 mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount); 456 if (bkpinfo->netfs_user != NULL) { 457 mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount); 458 } else { 459 mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount); 460 } 457 461 strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4); 458 462 mr_free(tmp1); … … 679 683 sprintf(tmp, "ls -l %s", bkpinfo->isodir); 680 684 if (run_program_and_log_output(tmp, 2)) { 681 fatal_error 682 ("output folder does not exist - please create it"); 685 fatal_error("output folder does not exist - please create it"); 683 686 } 684 687 } else if (flag_set['n']) {
Note:
See TracChangeset
for help on using the changeset viewer.