kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

FS-8818 #resolve refactor X-PRE include to not toss error if there are not files that match the include

Browse Source
This commit is contained in:
Ken Rice 2016-02-09 16:38:47 -06:00 committed by Brian West
parent 7f5af042be
commit a80c67e375
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/switch_xml.c
View File

@ -1298,15 +1298,20 @@ static FILE *preprocess_glob(const char *cwd, const char *pattern, FILE *write_f
char *dir_path = NULL, *e = NULL; char *dir_path = NULL, *e = NULL;
glob_t glob_data; glob_t glob_data;
size_t n; size_t n;
int glob_return;
if (!switch_is_file_path(pattern)) { if (!switch_is_file_path(pattern)) {
full_path = switch_mprintf("%s%s%s", cwd, SWITCH_PATH_SEPARATOR, pattern); full_path = switch_mprintf("%s%s%s", cwd, SWITCH_PATH_SEPARATOR, pattern);
pattern = full_path; pattern = full_path;
} }
if (glob(pattern, GLOB_NOCHECK, NULL, &glob_data) != 0) { glob_return = glob(pattern, GLOB_ERR, NULL, &glob_data);
if (glob_return == GLOB_NOSPACE || glob_return == GLOB_ABORTED) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error including %s\n", pattern); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error including %s\n", pattern);
goto end; goto end;
} else if (glob_return == GLOB_NOMATCH) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No files to include at %s\n", pattern);
goto end;
} }
for (n = 0; n < glob_data.gl_pathc; ++n) { for (n = 0; n < glob_data.gl_pathc; ++n) {
@ -1324,7 +1329,7 @@ static FILE *preprocess_glob(const char *cwd, const char *pattern, FILE *write_f
} }
globfree(&glob_data); globfree(&glob_data);
end: end:
switch_safe_free(full_path); switch_safe_free(full_path);