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	18 Feb 2007 03:42:33 -0000
***************
*** 18,23 ****
--- 18,28 ----
  
  #include <config.h>
  
+ #ifdef __MINGW__
+ #include <windows.h>
+ #endif
+ 
+ 
  #include "file-name.h"
  
  #include <ctype.h>
***************
*** 29,34 ****
--- 34,41 ----
  #include "intprops.h"
  #include "minmax.h"
  #include "settings.h"
+ #include "pathname.h"
+ #include "dirname.h"
  
  #include <libpspp/alloc.h>
  #include <libpspp/message.h>
***************
*** 44,50 ****
--- 51,75 ----
  #include <sys/stat.h>
  
  /* Initialization. */
+ //#define MAX(a, b) (a > b ? a : b)
+ 
+ #ifdef __MINGW__
+ #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 STRRCHR_SLASH(a) (strrchr((a),'/'))
+ #endif
+ #define NOTSLASH(a) (!ISSLASH(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);
  
--- 153,160 ----
        /* Construct file name. */
        ds_clear (&file);
        ds_put_substring (&file, dir);
!       //if (!ds_is_empty (&file) && ds_last (&file) != '/')
!       if (!ds_is_empty (&file) && NOTSLASH (ds_last (&file)))
  	ds_put_char (&file, '/');
        ds_put_cstr (&file, base_name);
  
***************
*** 153,169 ****
  char *
  fn_dir_name (const char *file_name)
  {
    const char *p;
    char *s;
    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,201 ----
  char *
  fn_dir_name (const char *file_name)
  {
+ #if 1
+   return dir_name(file_name);
+ #else
    const char *p;
    char *s;
    size_t len;
  
    len = strlen (file_name);
!   //if (len == 1 && file_name[0] == '/')
!   if (len == 1 && (ISSLASH (file_name[0])))
      p = file_name + 1;
!   //else if (len && file_name[len - 1] == '/')
!   else if (len && (ISSLASH (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;
  
***************
*** 172,177 ****
--- 204,210 ----
    s[p - file_name] = 0;
  
    return s;
+ #endif
  }
  
  /* Returns the extension part of FILE_NAME as a malloc()'d string.
***************
*** 192,198 ****
  bool
  fn_is_absolute (const char *name)
  {
!   return name[0] == '/';
  }
  
  /* Returns true if FILE_NAME is a virtual file that doesn't
--- 225,231 ----
  bool
  fn_is_absolute (const char *name)
  {
! 	return (IS_ABSOLUTE_PATH(name));
  }
  
  /* Returns true if FILE_NAME is a virtual file that doesn't
***************
*** 399,408 ****
  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;
    return identity;
  }
--- 432,452 ----
  struct file_identity *
  fn_get_identity (const char *file_name) 
  {
!       	struct file_identity *identity = xmalloc (sizeof *identity);
! #ifdef __MINGW__
!   char *cname=xmalloc(PATH_MAX);
! 
!   if (!GetFullPathName(file_name,PATH_MAX,cname,NULL))
!   {
!     free(cname);
!     cname = xstrdup (file_name);
!   }
! #else 
    char *cname = canonicalize_filename_mode (file_name, CAN_MISSING);
+ 
    if (cname == NULL)
      cname = xstrdup (file_name);
+ #endif
    identity->normalized_file_name = cname;
    return identity;
  }
***************
*** 423,428 ****
--- 467,476 ----
  fn_compare_file_identities (const struct file_identity *a,
                              const struct file_identity *b) 
  {
+ #ifdef __MINGW__
+   return strcasecmp (a->normalized_file_name, b->normalized_file_name);
+ #else
    return strcmp (a->normalized_file_name, b->normalized_file_name);
+ #endif
  }
  #endif /* not unix */