1.0.4.40: small fixes

[sbcl.git] / src / runtime / wrap.c

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index 39080d2..93c6bcf 100644 (file)
--- a/src/runtime/wrap.c
+++ b/src/runtime/wrap.c
@@ -1,6 +1,6 @@
 /*
  * wrappers around low-level operations to provide a simpler interface
- * to the operations that Lisp needs
+ * to the operations that Lisp (and some contributed modules) needs.
  *
  * The functions in this file are typically called directly from Lisp.
  * Thus, when their signature changes, they don't need updates in a .h
@@ -30,9 +30,12 @@
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <unistd.h>
 #ifndef LISP_FEATURE_WIN32
 #include <pwd.h>
+#include <sys/wait.h>
+#include <netdb.h>
 #endif
 #include <stdio.h>
 
@@ -164,14 +167,26 @@ wrapped_readlink(char *path)
  *
  * Some motivated spark fixed MIPS. -- ths, 2005-10-06 */
 
-#ifdef LISP_FEATURE_MIPS
+#if defined (LISP_FEATURE_LARGEFILE)
+typedef dev_t ffi_dev_t;
+typedef off_t ffi_off_t;
+#elif defined(LISP_FEATURE_MIPS)
 typedef unsigned long ffi_dev_t; /* Linux/MIPS struct stat doesn't use dev_t */
 typedef off_t ffi_off_t;
+#elif defined(LISP_FEATURE_DARWIN)
+typedef dev_t ffi_dev_t;
+typedef off_t ffi_off_t;
 #else
 typedef u32 ffi_dev_t; /* since Linux dev_t can be 64 bits */
 typedef u32 ffi_off_t; /* since OpenBSD 2.8 st_size is 64 bits */
 #endif
 
+#if defined(LISP_FEATURE_DARWIN)
+typedef blksize_t ffi_blksize_t;
+#else
+typedef unsigned long ffi_blksize_t;
+#endif
+
 /* a representation of stat(2) results which doesn't depend on CPU or OS */
 struct stat_wrapper {
     /* KLUDGE: The verbose wrapped_st_ prefixes are to protect us from
@@ -198,7 +213,7 @@ struct stat_wrapper {
 #endif
     ffi_dev_t     wrapped_st_rdev;        /* device type (if inode device) */
     ffi_off_t     wrapped_st_size;        /* total size, in bytes */
-    unsigned long wrapped_st_blksize;     /* blocksize for filesystem I/O */
+    ffi_blksize_t wrapped_st_blksize;     /* blocksize for filesystem I/O */
     unsigned long wrapped_st_blocks;      /* number of blocks allocated */
     time_t        wrapped_st_atime;       /* time_t of last access */
     time_t        wrapped_st_mtime;       /* time_t of last modification */
@@ -238,13 +253,21 @@ stat_wrapper(const char *file_name, struct stat_wrapper *buf)
 
 #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
 
@@ -351,6 +374,7 @@ wrapped_environ()
 #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.
@@ -377,7 +401,7 @@ int select(int top_fd, DWORD *read_set, DWORD *write_set, DWORD *except_set, tim
         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);
         }
     }
 
@@ -410,3 +434,76 @@ int gettimeofday(long *timeval, long *timezone)
     return 0;
 }
 #endif
+
+
+/* We will need to define these things or their equivalents for Win32
+   eventually, but for now let's get it working for everyone else. */
+#ifndef LISP_FEATURE_WIN32
+/* From SB-BSD-SOCKETS, to get h_errno */
+int get_h_errno()
+{
+    return h_errno;
+}
+
+/* From SB-POSIX, wait-macros */
+int wifexited(int status) {
+    return WIFEXITED(status);
+}
+int wexitstatus(int status) {
+    return WEXITSTATUS(status);
+}
+int wifsignaled(int status) {
+    return WIFSIGNALED(status);
+}
+int wtermsig(int status) {
+    return WTERMSIG(status);
+}
+int wifstopped(int status) {
+    return WIFSTOPPED(status);
+}
+int wstopsig(int status) {
+    return WSTOPSIG(status);
+}
+/* FIXME: POSIX also defines WIFCONTINUED, but that appears not to
+   exist on at least Linux... */
+#endif  /* !LISP_FEATURE_WIN32 */
+
+/* From SB-POSIX, stat-macros */
+int s_isreg(mode_t mode)
+{
+    return S_ISREG(mode);
+}
+int s_isdir(mode_t mode)
+{
+    return S_ISDIR(mode);
+}
+int s_ischr(mode_t mode)
+{
+    return S_ISCHR(mode);
+}
+int s_isblk(mode_t mode)
+{
+    return S_ISBLK(mode);
+}
+int s_isfifo(mode_t mode)
+{
+    return S_ISFIFO(mode);
+}
+#ifndef LISP_FEATURE_WIN32
+int s_islnk(mode_t mode)
+{
+#ifdef S_ISLNK
+    return S_ISLNK(mode);
+#else
+    return ((mode & S_IFMT) == S_IFLNK);
+#endif
+}
+int s_issock(mode_t mode)
+{
+#ifdef S_ISSOCK
+    return S_ISSOCK(mode);
+#else
+    return ((mode & S_IFMT) == S_IFSOCK);
+#endif
+}
+#endif /* !LISP_FEATURE_WIN32 */