6 files changed, 64 insertions, 0 deletions
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 <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$".
 //
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 <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$".
 //
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 <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$".
 //