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

1 files changed, 3 insertions, 78 deletions

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 <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$".
 //