From 7bbd60007620cf3cc3ee7a913f7010588808ebb2 Mon Sep 17 00:00:00 2001 From: scarab Date: Fri, 15 Aug 2008 19:57:10 +0000 Subject: "- initial commit for GETTEXT support and K&R compilance" git-svn-id: http://opensvn.csie.org/tuxanci_ng@196 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/base/director.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'src/base/director.c') diff --git a/src/base/director.c b/src/base/director.c index 68bfae5..a4c8496 100755 --- a/src/base/director.c +++ b/src/base/director.c @@ -22,55 +22,40 @@ director_t* loadDirector(char *s) DIR *dir; struct dirent *item; char path[STR_PATH_SIZE]; - assert( s != 0 ); - new = malloc( sizeof(director_t) ); memset(new, 0, sizeof(director_t) ); - new->list = newList(); #ifndef __WIN32__ if( s[0] == '/' ) #else if( s[1] == ':' ) #endif - { strcpy(path, s); - } - else - { - // tohle je opravdu dobre... + else { + // this is really correct aproach getcwd(path, STR_PATH_SIZE); strcat(path, "/"); strcat(path, s); } new->path = strdup(path); - dir = opendir(new->path); - - if( dir == NULL ) - { + if( dir == NULL ) { free(new->path); free(new); - return NULL; } - while( ( item = readdir(dir) ) != NULL ) + while((item = readdir(dir)) != NULL) addList(new->list, strdup(item->d_name) ); - closedir(dir); - return new; } void destroyDirector(director_t *p) { assert( p != NULL ); - destroyListItem(p->list, free); free(p->path); free(p); } - - -- cgit v1.2.3