From 19b98e40de481349f88c02883a2330ed19ccd316 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 7 Apr 2016 16:54:20 +0000 Subject: Rewrite filename_expand.cxx under the driver model. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11553 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_System_Driver.cxx | 45 ++++++++++++++ src/drivers/Darwin/Fl_Darwin_System_Driver.H | 1 + src/drivers/Darwin/Fl_Darwin_System_Driver.cxx | 9 +++ src/drivers/Posix/Fl_Posix_System_Driver.H | 1 + src/drivers/Posix/Fl_Posix_System_Driver.cxx | 8 +++ src/drivers/WinAPI/Fl_WinAPI_System_Driver.H | 1 + src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 44 ++++++++++++++ src/filename_expand.cxx | 81 +------------------------- 8 files changed, 112 insertions(+), 78 deletions(-) (limited to 'src') diff --git a/src/Fl_System_Driver.cxx b/src/Fl_System_Driver.cxx index 212c293fd..0ececcb92 100644 --- a/src/Fl_System_Driver.cxx +++ b/src/Fl_System_Driver.cxx @@ -24,6 +24,7 @@ #include #include #include +#include "flstring.h" const int Fl_System_Driver::flNoValue = 0x0000; const int Fl_System_Driver::flWidthValue = 0x0004; @@ -372,6 +373,50 @@ int Fl_System_Driver::clocale_printf(FILE *output, const char *format, va_list a return vfprintf(output, format, args); } +int Fl_System_Driver::filename_expand(char *to,int tolen, const char *from) { + char *temp = new char[tolen]; + strlcpy(temp,from, tolen); + char *start = temp; + char *end = temp+strlen(temp); + + int ret = 0; + + for (char *a=temp; a= tolen) end += tolen - (end+1-e+t); + memmove(a+t, e, end+1-e); + end = a+t+(end-e); + *end = '\0'; + memcpy(a, value, t); + ret++; + } else { + a = e+1; + } + } + strlcpy(to, start, tolen); + delete[] temp; + return ret; +} + // // End of "$Id$". // diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H index 0803f32d5..85c8a3fa3 100644 --- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H +++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H @@ -69,6 +69,7 @@ public: virtual int event_key(int k); virtual int get_key(int k); virtual int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **) ); + virtual const char *getpwnam(const char *login); }; #endif // FL_DARWIN_SYSTEM_DRIVER_H diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx index 617e8b19d..246c38e9f 100644 --- a/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx +++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.cxx @@ -28,6 +28,7 @@ #include #include #include +#include extern int fl_mac_os_version; // the version number of the running Mac OS X @@ -135,6 +136,14 @@ int Fl_Darwin_System_Driver::filename_list(const char *d, dirent ***list, int (* return n; } + +const char *Fl_Darwin_System_Driver::getpwnam(const char *login) { + struct passwd *pwd; + pwd = ::getpwnam(login); + return pwd ? pwd->pw_dir : NULL; +} + + // // End of "$Id$". // diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H index aa922d590..74102675c 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.H +++ b/src/drivers/Posix/Fl_Posix_System_Driver.H @@ -66,6 +66,7 @@ public: virtual int event_key(int k); virtual int get_key(int k); virtual int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **) ); + virtual const char *getpwnam(const char *login); }; #endif // FL_POSIX_SYSTEM_DRIVER_H diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx index 6ce92675f..4d0dd2003 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx @@ -23,6 +23,8 @@ #include #include #include +#include +#include // Pointers you can use to change FLTK to a foreign language. // Note: Similar pointers are defined in FL/fl_ask.H and src/fl_ask.cxx @@ -140,6 +142,12 @@ int Fl_Posix_System_Driver::filename_list(const char *d, dirent ***list, int (*s return n; } +const char *Fl_Posix_System_Driver::getpwnam(const char *login) { + struct passwd *pwd; + pwd = ::getpwnam(login); + return pwd ? pwd->pw_dir : NULL; +} + // // End of "$Id$". // diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index ccf51aec0..75fdbc860 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -69,6 +69,7 @@ public: virtual int event_key(int k); virtual int get_key(int k); virtual int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **) ); + virtual int filename_expand(char *to,int tolen, const char *from); }; #endif // FL_WINAPI_SYSTEM_DRIVER_H diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index 9a0c25d4d..cbd5f9081 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -27,6 +27,9 @@ #include #include #include +#include "../../flstring.h" + +inline int isdirsep(char c) { return c == '/' || c == '\\'; } #if !defined(FL_DOXYGEN) const char* fl_local_alt = "Alt"; @@ -442,6 +445,47 @@ int Fl_WinAPI_System_Driver::filename_list(const char *d, dirent ***list, int (* return fl_scandir(d, list, 0, sort); } +int Fl_WinAPI_System_Driver::filename_expand(char *to,int tolen, const char *from) { + char *temp = new char[tolen]; + strlcpy(temp,from, tolen); + char *start = temp; + char *end = temp+strlen(temp); + int ret = 0; + for (char *a=temp; a= tolen) end += tolen - (end+1-e+t); + memmove(a+t, e, end+1-e); + end = a+t+(end-e); + *end = '\0'; + memcpy(a, value, t); + ret++; + } else { + a = e+1; + if (*e == '\\') {*e = '/'; ret++;} // ha ha! + } + } + strlcpy(to, start, tolen); + delete[] temp; + return ret; +} + // // End of "$Id$". // diff --git a/src/filename_expand.cxx b/src/filename_expand.cxx index ff687f7d5..4179ce43d 100644 --- a/src/filename_expand.cxx +++ b/src/filename_expand.cxx @@ -16,27 +16,8 @@ // http://www.fltk.org/str.php // -/* expand a file name by substuting environment variables and - home directories. Returns true if any changes were made. - to & from may be the same buffer. -*/ - -#include -#include -#include -#include "flstring.h" -#if defined(WIN32) && !defined(__CYGWIN__) -#include -#else -# include -# include -#endif - -#if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__) -static inline int isdirsep(char c) {return c=='/' || c=='\\';} -#else -#define isdirsep(c) ((c)=='/') -#endif +#include +#include /** Expands a filename containing shell variables and tilde (~). Currently handles these variants: @@ -61,65 +42,9 @@ static inline int isdirsep(char c) {return c=='/' || c=='\\';} \return 0 if no change, non zero otherwise */ int fl_filename_expand(char *to,int tolen, const char *from) { - - char *temp = new char[tolen]; - strlcpy(temp,from, tolen); - char *start = temp; - char *end = temp+strlen(temp); - - int ret = 0; - - for (char *a=temp; apw_dir; -#endif - } - break; - case '$': /* an environment variable */ - {char t = *e; *(char *)e = 0; value = fl_getenv(a+1); *(char *)e = t;} - break; - } - if (value) { - // substitutions that start with slash delete everything before them: - if (isdirsep(value[0])) start = a; -#if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__) - // also if it starts with "A:" - if (value[0] && value[1]==':') start = a; -#endif - int t = (int) strlen(value); if (isdirsep(value[t-1])) t--; - if ((end+1-e+t) >= tolen) end += tolen - (end+1-e+t); - memmove(a+t, e, end+1-e); - end = a+t+(end-e); - *end = '\0'; - memcpy(a, value, t); - ret++; - } else { - a = e+1; -#if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__) - if (*e == '\\') {*e = '/'; ret++;} // ha ha! -#endif - } - } - - strlcpy(to, start, tolen); - - delete[] temp; - - return ret; + return Fl::system_driver()->filename_expand(to, tolen, from); } - // // End of "$Id$". // -- cgit v1.2.3