mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite filename_expand.cxx under the driver model.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11553 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-04-07 16:54:20 +00:00
parent 050dfb5504
commit 19b98e40de
9 changed files with 116 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FL/Fl_System_Driver.H
View File

@ -98,6 +98,10 @@ public:
virtual int get_key(int k) {return 0;}
// implement scandir-like function
virtual int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **) ) {return -1;}
// the default implementation of filename_expand may be enough
virtual int filename_expand(char *to, int tolen, const char *from);
// to implement
virtual const char *getpwnam(const char *login) {return NULL;}
};
#endif // FL_SYSTEM_DRIVER_H

45
src/Fl_System_Driver.cxx
View File

@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#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<end; ) { // for each slash component
char *e; for (e=a; e<end && *e != '/'; e++) {/*empty*/} // find next slash
const char *value = 0; // this will point at substitute value
switch (*a) {
case '~': // a home directory name
if (e <= a+1) { // current user's directory
value = getenv("HOME");
} else { // another user's directory
char t = *e; *(char *)e = 0;
value = getpwnam(a+1);
*(char *)e = t;
}
break;
case '$': /* an environment variable */
{char t = *e; *(char *)e = 0; value = getenv(a+1); *(char *)e = t;}
break;
}
if (value) {
// substitutions that start with slash delete everything before them:
if (value[0] == '/') start = a;
int t = (int) strlen(value); if (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;
}
}
strlcpy(to, start, tolen);
delete[] temp;
return ret;
}
//
// End of "$Id$".
//

1
src/drivers/Darwin/Fl_Darwin_System_Driver.H
View File

@ -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

9
src/drivers/Darwin/Fl_Darwin_System_Driver.cxx
View File

@ -28,6 +28,7 @@
#include <locale.h>
#include <stdio.h>
#include <dlfcn.h>
#include <pwd.h>
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$".
//

1
src/drivers/Posix/Fl_Posix_System_Driver.H
View File

@ -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

8
src/drivers/Posix/Fl_Posix_System_Driver.cxx
View File

@ -23,6 +23,8 @@
#include <X11/Xlib.h>
#include <locale.h>
#include <stdio.h>
#include <sys/types.h>
#include <pwd.h>
// 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$".
//

1
src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
View File

@ -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

44
src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx
View File

@ -27,6 +27,9 @@
#include <wchar.h>
#include <process.h>
#include <locale.h>
#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<end; ) { // for each slash component
char *e; for (e=a; e<end && !isdirsep(*e); e++) {/*empty*/} // find next slash
const char *value = 0; // this will point at substitute value
switch (*a) {
case '~': // a home directory name
if (e <= a+1) { // current user's directory
value = getenv("HOME");
}
break;
case '$': /* an environment variable */
{char t = *e; *(char *)e = 0; value = getenv(a+1); *(char *)e = t;}
break;
}
if (value) {
// substitutions that start with slash delete everything before them:
if (isdirsep(value[0])) start = a;
// also if it starts with "A:"
if (value[0] && value[1]==':') start = a;
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 (*e == '\\') {*e = '/'; ret++;} // ha ha!
}
}
strlcpy(to, start, tolen);
delete[] temp;
return ret;
}
//
// End of "$Id$".
//

81
src/filename_expand.cxx
View File

@ -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 <FL/filename.H>
#include <FL/fl_utf8.h>
#include <stdlib.h>
#include "flstring.h"
#if defined(WIN32) && !defined(__CYGWIN__)
#include <windows.h>
#else
# include <unistd.h>
# include <pwd.h>
#endif
#if defined(WIN32) || defined(__EMX__) && !defined(__CYGWIN__)
static inline int isdirsep(char c) {return c=='/' || c=='\\';}
#else
#define isdirsep(c) ((c)=='/')
#endif
#include <FL/Fl_System_Driver.H>
#include <FL/Fl.H>
/** 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; a<end; ) { // for each slash component
char *e; for (e=a; e<end && !isdirsep(*e); e++) {/*empty*/} // find next slash
const char *value = 0; // this will point at substitute value
switch (*a) {
case '~': // a home directory name
if (e <= a+1) { // current user's directory
value = fl_getenv("HOME");
#ifndef WIN32
} else { // another user's directory
struct passwd *pwd;
char t = *e; *(char *)e = 0;
pwd = getpwnam(a+1);
*(char *)e = t;
if (pwd) value = pwd->pw_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$".
//