#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include <unistd.h>
#ifndef LISP_FEATURE_WIN32
#include <pwd.h>
#ifdef LISP_FEATURE_WIN32
/*
- * Windows won't match the last component of a pathname if there is
- * a trailing #\/ character. So we do silly things like this:
+ * Windows won't match the last component of a pathname if there
+ * is a trailing #\/ or #\\, except if it's <drive>:\ or <drive>:/
+ * in which case it behaves the other way around. So we remove the
+ * trailing directory separator unless we are being passed just a
+ * drive name (e.g. "c:\\"). Some, but not all, of this
+ * strangeness is documented at Microsoft's support site (as of
+ * 2006-01-08, at
+ * <http://support.microsoft.com/default.aspx?scid=kb;en-us;168439>)
*/
char file_buf[MAX_PATH];
strcpy(file_buf, file_name);
- int foo = strlen(file_name);
- if (foo && (file_name[foo-1] == '/')) file_buf[foo-1] = 0;
+ int len = strlen(file_name);
+ if (len != 0 && (file_name[len-1] == '/' || file_name[len-1] == '\\') &&
+ !(len == 3 && file_name[1] == ':' && isalpha(file_name[0])))
+ file_buf[len-1] = '\0';
file_name = file_buf;
#endif
#ifdef LISP_FEATURE_WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#include <time.h>
/*
* faked-up implementation of select(). Right now just enough to get through
* second genesis.
if (read_set[i >> 5] & (1 << (i & 31))) {
read_set[i >> 5] &= ~(1 << (i & 31));
fds[num_handles] = i;
- handles[num_handles++] = _get_osfhandle(i);
+ handles[num_handles++] = (HANDLE) _get_osfhandle(i);
}
}
}
/*
- * SBCL doesn't like backslashes in pathnames from getcwd for some reason.
- * Probably because they don't happen in posix systems. Windows doesn't
- * mind slashes, so we convert from one to the other. We also strip off
- * the drive prefix while we're at it ("C:", or whatever).
- *
- * The real fix for this problem is to create a windows-host setup that
- * parallels the unix-host in src/code/target-pathname.lisp and actually
- * parse this junk properly, drive letter and everything.
- *
- * Also see POSIX-GETCWD in src/code/unix.lisp.
- */
-char *wrap_getcwd(char *buf, size_t len)
-{
- char *retval = _getcwd(buf, len);
-
- if (retval[1] == ':') {
- char *p;
- for (p = retval; (*p = p[2]); p++)
- if (*p == '\\') *p = '/';
- }
-
- return retval;
-}
-
-/*
* Windows doesn't have gettimeofday(), and we need it for the compiler,
* for serve-event, and for a couple other things. We don't need a timezone
* yet, however, and the closest we can easily get to a timeval is the