kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_musiconhold: Don't chdir() when scanning MoH files"

Browse Source
This commit is contained in:
zuul
2017-03-29 10:11:01 -05:00
committed by Gerrit Code Review
parent f43cfb81d9 d22c678999
commit 5a530171ca
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/res_musiconhold.c
View File

@@ -1112,16 +1112,13 @@ static int moh_scan_files(struct mohclass *class) {
DIR *files_DIR; DIR *files_DIR;
struct dirent *files_dirent; struct dirent *files_dirent;
char dir_path[PATH_MAX]; char dir_path[PATH_MAX];
char path[PATH_MAX];
char filepath[PATH_MAX]; char filepath[PATH_MAX];
char *ext; char *ext;
struct stat statbuf; struct stat statbuf;
int i; int i;
if (class->dir[0] != '/') { if (class->dir[0] != '/') {
ast_copy_string(dir_path, ast_config_AST_DATA_DIR, sizeof(dir_path)); snprintf(dir_path, sizeof(dir_path), "%s/%s", ast_config_AST_DATA_DIR, class->dir);
strncat(dir_path, "/", sizeof(dir_path) - 1);
strncat(dir_path, class->dir, sizeof(dir_path) - 1);
} else { } else {
ast_copy_string(dir_path, class->dir, sizeof(dir_path)); ast_copy_string(dir_path, class->dir, sizeof(dir_path));
} }
@@ -1137,16 +1134,6 @@ static int moh_scan_files(struct mohclass *class) {
} }
class->total_files = 0; class->total_files = 0;
if (!getcwd(path, sizeof(path))) {
ast_log(LOG_WARNING, "getcwd() failed: %s\n", strerror(errno));
closedir(files_DIR);
return -1;
}
if (chdir(dir_path) < 0) {
ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
closedir(files_DIR);
return -1;
}
while ((files_dirent = readdir(files_DIR))) { while ((files_dirent = readdir(files_DIR))) {
/* The file name must be at least long enough to have the file type extension */ /* The file name must be at least long enough to have the file type extension */
if ((strlen(files_dirent->d_name) < 4)) if ((strlen(files_dirent->d_name) < 4))
@@ -1183,10 +1170,6 @@ static int moh_scan_files(struct mohclass *class) {
} }
closedir(files_DIR); closedir(files_DIR);
if (chdir(path) < 0) {
ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
return -1;
}
if (ast_test_flag(class, MOH_SORTALPHA)) if (ast_test_flag(class, MOH_SORTALPHA))
qsort(&class->filearray[0], class->total_files, sizeof(char *), moh_sort_compare); qsort(&class->filearray[0], class->total_files, sizeof(char *), moh_sort_compare);
return class->total_files; return class->total_files;