kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change the directory walking functions to pass it the buffer. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5458 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-06-24 20:37:41 +00:00
parent 498aca8df8
commit f0bf734e6e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_apr.h
View File

@ -744,7 +744,7 @@ typedef struct switch_dir switch_dir_t;
SWITCH_DECLARE(switch_status_t) switch_dir_open(switch_dir_t **new_dir, const char *dirname, switch_memory_pool_t *pool); SWITCH_DECLARE(switch_status_t) switch_dir_open(switch_dir_t **new_dir, const char *dirname, switch_memory_pool_t *pool);
SWITCH_DECLARE(switch_status_t) switch_dir_close(switch_dir_t *thedir); SWITCH_DECLARE(switch_status_t) switch_dir_close(switch_dir_t *thedir);
SWITCH_DECLARE(const char *) switch_dir_next_file(switch_dir_t *thedir); SWITCH_DECLARE(const char *) switch_dir_next_file(switch_dir_t *thedir, char *buf, switch_size_t len);
/** @} */ /** @} */

11
src/switch_apr.c
View File

@ -402,18 +402,19 @@ SWITCH_DECLARE(switch_status_t) switch_dir_close(switch_dir_t *thedir)
return apr_dir_close(thedir->dir_handle); return apr_dir_close(thedir->dir_handle);
} }
SWITCH_DECLARE(const char *) switch_dir_next_file(switch_dir_t *thedir) SWITCH_DECLARE(const char *) switch_dir_next_file(switch_dir_t *thedir, char *buf, switch_size_t len)
{ {
const char *fname = NULL; const char *fname = NULL;
apr_int32_t finfo_flags = APR_FINFO_DIRENT | APR_FINFO_TYPE | APR_FINFO_NAME; apr_int32_t finfo_flags = APR_FINFO_DIRENT | APR_FINFO_TYPE | APR_FINFO_NAME;
while (apr_dir_read(&(thedir->finfo), finfo_flags, thedir->dir_handle) == SWITCH_STATUS_SUCCESS) { while (apr_dir_read(&(thedir->finfo), finfo_flags, thedir->dir_handle) == SWITCH_STATUS_SUCCESS) {
if (thedir->finfo.filetype != APR_REG) if (thedir->finfo.filetype != APR_REG)
continue; continue;
fname = thedir->finfo.fname; if (thedir->finfo.fname) {
if (!fname) switch_copy_string(buf, thedir->finfo.fname, len);
fname = thedir->finfo.name; fname = buf;
if (!fname) } else {
continue; continue;
}
} }
return fname; return fname;
} }