From 6cdf3911055f04f1a2587483513483e1894bf6e1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 26 Mar 2006 23:32:24 +0000 Subject: ported to windows, and some UNIX-side cleanups and fixes as well. Now its time to test it on Mac OS X and try to get envvar expansion working svn path=/trunk/externals/hcs/; revision=4776 --- folder_list.c | 107 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 28 deletions(-) (limited to 'folder_list.c') diff --git a/folder_list.c b/folder_list.c index d1863af..9adee97 100644 --- a/folder_list.c +++ b/folder_list.c @@ -1,7 +1,15 @@ #include + +#ifdef _WIN32 +#define _WIN32_WINNT 0x0400 +#include +#include +#else +#include #include +#endif -static char *version = "$Revision: 1.4 $"; +static char *version = "$Revision: 1.5 $"; #define DEBUG(x) //#define DEBUG(x) x @@ -12,55 +20,95 @@ static char *version = "$Revision: 1.4 $"; static t_class *folder_list_class; typedef struct _folder_list { - t_object x_obj; - t_symbol *x_pattern; - glob_t x_glob; + t_object x_obj; + t_symbol *x_pattern; } t_folder_list; /*------------------------------------------------------------------------------ * IMPLEMENTATION */ +// TODO: regexp ~ to USERPROFILE for Windows +// TODO: make FindFirstFile display when its just a dir static void folder_list_output(t_folder_list* x) { DEBUG(post("folder_list_output");); - unsigned int i; +#ifdef _WIN32 + WIN32_FIND_DATA FindFileData; + HANDLE hFind; + DWORD errorNumber; + LPVOID lpErrorMessage; + + hFind = FindFirstFile(x->x_pattern->s_name, &FindFileData); + if (hFind == INVALID_HANDLE_VALUE) + { + errorNumber = GetLastError(); + switch (errorNumber) + { + case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + error("[folder_list] nothing found for \"%s\"",x->x_pattern->s_name); + break; + default: + FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + errorNumber, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpErrorMessage, + 0, NULL ); + error("[folder_list] %s", lpErrorMessage); + } + return; + } + do { + outlet_symbol( x->x_obj.ob_outlet, gensym(FindFileData.cFileName) ); + } while (FindNextFile(hFind, &FindFileData) != 0); + FindClose(hFind); +#else + unsigned int i; + glob_t glob_buffer; + DEBUG(post("globbing %s",x->x_pattern->s_name);); - switch( glob( x->x_pattern->s_name, GLOB_TILDE, NULL, &(x->x_glob) ) ) + switch( glob( x->x_pattern->s_name, GLOB_TILDE, NULL, &glob_buffer ) ) { - case GLOB_NOSPACE: - error("[folder_list] out of memory"); break; - case GLOB_ABORTED: - error("[folder_list] aborted"); break; - case GLOB_NOMATCH: - error("[folder_list] no match"); break; + case GLOB_NOSPACE: + error("[folder_list] out of memory for \"%s\"",x->x_pattern->s_name); + break; + case GLOB_ABORTED: + error("[folder_list] aborted \"%s\"",x->x_pattern->s_name); + break; + case GLOB_NOMATCH: + error("[folder_list] nothing found for \"%s\"",x->x_pattern->s_name); + break; } - for(i = 0; i < x->x_glob.gl_pathc; i++) - outlet_symbol( x->x_obj.ob_outlet, gensym(x->x_glob.gl_pathv[i]) ); -} - - -static void folder_list_symbol(t_folder_list *x, t_symbol *s) -{ - x->x_pattern = s; - folder_list_output(x); + for(i = 0; i < glob_buffer.gl_pathc; i++) + outlet_symbol( x->x_obj.ob_outlet, gensym(glob_buffer.gl_pathv[i]) ); + globfree( &(glob_buffer) ); +#endif } static void folder_list_set(t_folder_list* x, t_symbol *s) { DEBUG(post("folder_list_set");); +#ifdef _WIN32 + char string_buffer[MAX_PATH]; + ExpandEnvironmentStrings(s->s_name, string_buffer, MAX_PATH); + x->x_pattern = gensym(string_buffer); +#else x->x_pattern = s; +#endif } -static void folder_list_free(t_folder_list* x) +static void folder_list_symbol(t_folder_list *x, t_symbol *s) { - DEBUG(post("folder_list_free");); - - globfree( &(x->x_glob) ); + folder_list_set(x,s); + folder_list_output(x); } @@ -72,7 +120,11 @@ static void *folder_list_new(t_symbol *s) post("[folder_list] %s, written by Hans-Christoph Steiner ",version); /* TODO set current dir of patch as default */ - x->x_pattern = gensym("/"); +#ifdef _WIN32 + x->x_pattern = gensym(getenv("USERPROFILE")); +#else + x->x_pattern = gensym(getenv("HOME")); +#endif symbolinlet_new(&x->x_obj, &x->x_pattern); outlet_new(&x->x_obj, &s_symbol); @@ -89,13 +141,12 @@ void folder_list_setup(void) DEBUG(post("folder_list_setup");); folder_list_class = class_new(gensym("folder_list"), (t_newmethod)folder_list_new, - (t_method)folder_list_free, + 0, sizeof(t_folder_list), 0, A_DEFSYM, 0); /* add inlet datatype methods */ -// class_addfloat(folder_list_class,(t_method) glob_float); class_addbang(folder_list_class,(t_method) folder_list_output); class_addsymbol(folder_list_class,(t_method) folder_list_symbol); -- cgit v1.2.1