Index: src/data/file-name.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/file-name.c,v
retrieving revision 1.11
diff -c -r1.11 file-name.c
*** src/data/file-name.c	12 Feb 2007 02:10:55 -0000	1.11
--- src/data/file-name.c	17 Feb 2007 11:41:53 -0000
***************
*** 44,50 ****
--- 44,70 ----
  #include <sys/stat.h>
  
  /* Initialization. */
+ //#define MAX(a, b) (a > b ? a : b)
  
+ #ifdef __MINGW__
+ #define IS_SLASH(a) ((a)=='\\'||(a)=='/')
+ #define STRRCHR_SLASH(a) (MAX(strrchr((a),'\\'),strrchr((a),'/')))
+ static void fn_posixify_path (char* s) {
+   while (s[0] != '\0') {
+     if (s[0]=='\\') {
+       s[0]='/';
+     }
+     s++;
+   }
+ }
+ #else
+ #define IS_SLASH(a) ((a)=='/')
+ #define STRRCHR_SLASH(a) (strrchr((a),'/'))
+ #endif
+ #define NOT_SLASH(a) (!IS_SLASH(a))
+ 
+ 
+ 		
  const char *config_path;
  
  void
***************
*** 128,134 ****
        /* Construct file name. */
        ds_clear (&file);
        ds_put_substring (&file, dir);
!       if (!ds_is_empty (&file) && ds_last (&file) != '/')
  	ds_put_char (&file, '/');
        ds_put_cstr (&file, base_name);
  
--- 148,155 ----
        /* Construct file name. */
        ds_clear (&file);
        ds_put_substring (&file, dir);
!       //if (!ds_is_empty (&file) && ds_last (&file) != '/')
!       if (!ds_is_empty (&file) && NOT_SLASH (ds_last (&file)))
  	ds_put_char (&file, '/');
        ds_put_cstr (&file, base_name);
  
***************
*** 158,169 ****
    size_t len;
  
    len = strlen (file_name);
!   if (len == 1 && file_name[0] == '/')
      p = file_name + 1;
!   else if (len && file_name[len - 1] == '/')
      p = buf_find_reverse (file_name, len - 1, file_name + len - 1, 1);
    else
!     p = strrchr (file_name, '/');
    if (p == NULL)
      p = file_name;
  
--- 179,193 ----
    size_t len;
  
    len = strlen (file_name);
!   //if (len == 1 && file_name[0] == '/')
!   if (len == 1 && IS_SLASH (file_name[0]))
      p = file_name + 1;
!   //else if (len && file_name[len - 1] == '/')
!   else if (len && IS_SLASH (file_name[len - 1]))
      p = buf_find_reverse (file_name, len - 1, file_name + len - 1, 1);
    else
!     //p = strrchr (file_name, '/');
!     p = STRRCHR_SLASH (file_name);
    if (p == NULL)
      p = file_name;
  
***************
*** 192,198 ****
--- 216,233 ----
  bool
  fn_is_absolute (const char *name)
  {
+ #ifdef __MINGW__
+   if (name[0]=='\0')
+     return 0;
+   else if (IS_SLASH(name[0]))
+     return 1;
+   else if (name[1]==':')
+     return 1;
+   else
+     return 0;
+ #else 
    return name[0] == '/';
+ #endif
  }
  
  /* Returns true if FILE_NAME is a virtual file that doesn't
***************
*** 399,406 ****
  struct file_identity *
  fn_get_identity (const char *file_name) 
  {
!   struct file_identity *identity = xmalloc (sizeof *identity);
    char *cname = canonicalize_filename_mode (file_name, CAN_MISSING);
    if (cname == NULL)
      cname = xstrdup (file_name);
    identity->normalized_file_name = cname;
--- 434,445 ----
  struct file_identity *
  fn_get_identity (const char *file_name) 
  {
!       	struct file_identity *identity = xmalloc (sizeof *identity);
    char *cname = canonicalize_filename_mode (file_name, CAN_MISSING);
+ #ifdef __MINGW__
+   fn_posixify_path(cname);
+ #endif
+ 
    if (cname == NULL)
      cname = xstrdup (file_name);
    identity->normalized_file_name = cname;