X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=a510702172e95c46b9ca34e416843d1c15e484b1;hb=c2ac5ba3964165ee2d21ccd4c6bf8bdc48e1a165;hp=8d576d196ddf74e8387386b3b8dece316be2c963;hpb=7fb597b585fc715537ea644f7d84440eca217ca1;p=sbcl.git diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c index 8d576d1..a510702 100644 --- 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,14 +30,26 @@ #include #include #include +#include #include +#include +#include #ifndef LISP_FEATURE_WIN32 #include +#include +#include #endif #include +#if defined(LISP_FEATURE_WIN32) +#define WIN32_LEAN_AND_MEAN +#include +#include +#endif + #include "runtime.h" #include "util.h" +#include "wrap.h" /* Although it might seem as though this should be in some standard Unix header, according to Perry E. Metzger, in a message on @@ -148,62 +160,43 @@ wrapped_readlink(char *path) #endif /* - * stat(2) stuff + * realpath(3), including a wrapper for Windows. */ - -/* As of 0.6.12, the FFI can't handle 64-bit values. For now, we use - * these munged-to-32-bits values for might-be-64-bit slots of - * stat_wrapper as a workaround, so that at least we can still work - * when values are small. - * - * FIXME: But of course we should fix the FFI so that we can use the - * actual 64-bit values instead. In fact, we probably have by now - * (2003-10-03) on all working platforms except MIPS and HPPA; if some - * motivated spark would simply fix those, this hack could go away. - * -- CSR, 2003-10-03 - * - * Some motivated spark fixed MIPS. -- ths, 2005-10-06 */ - -#ifdef LISP_FEATURE_MIPS -typedef unsigned long ffi_dev_t; /* Linux/MIPS struct stat doesn't use 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 - -/* 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 - * the C preprocessor as wielded by the fiends of OpenBSD, who do - * things like - * #define st_atime st_atimespec.tv_sec - * I remember when I was young and innocent, I read about how the - * C preprocessor isn't to be used to globally munge random - * lowercase symbols like this, because things like this could - * happen, and I nodded sagely. But now I know better.:-| This is - * another entry for Dan Barlow's ongoing episodic rant about C - * header files, I guess.. -- WHN 2001-05-10 */ - ffi_dev_t wrapped_st_dev; /* device */ - ino_t wrapped_st_ino; /* inode */ - mode_t wrapped_st_mode; /* protection */ +char * sb_realpath (char *path) +{ #ifndef LISP_FEATURE_WIN32 - nlink_t wrapped_st_nlink; /* number of hard links */ - uid_t wrapped_st_uid; /* user ID of owner */ - gid_t wrapped_st_gid; /* group ID of owner */ + char *ret; + int errnum; + + if ((ret = calloc(PATH_MAX, sizeof(char))) == NULL) + return NULL; + if (realpath(path, ret) == NULL) { + errnum = errno; + free(ret); + errno = errnum; + return NULL; + } + return(ret); #else - short wrapped_st_nlink; /* Win32 doesn't have nlink_t */ - short wrapped_st_uid; /* Win32 doesn't have st_uid */ - short wrapped_st_gid; /* Win32 doesn't have st_gid */ + char *ret; + char *cp; + int errnum; + + if ((ret = calloc(MAX_PATH, sizeof(char))) == NULL) + return NULL; + if (GetFullPathName(path, MAX_PATH, ret, cp) == 0) { + errnum = errno; + free(ret); + errno = errnum; + return NULL; + } + return(ret); #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 */ - 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 */ - time_t wrapped_st_ctime; /* time_t of last change */ -}; +} + +/* + * stat(2) stuff + */ static void copy_to_stat_wrapper(struct stat_wrapper *to, struct stat *from) @@ -238,13 +231,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 :\ or :/ + * 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 + * ) */ 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 @@ -281,6 +282,30 @@ fstat_wrapper(int filedes, struct stat_wrapper *buf) return ret; } +/* A wrapper for mkstemp(3), which seems not to exist on Windows. */ +int sb_mkstemp (char *template) { +#ifdef LISP_FEATURE_WIN32 + int fd; + char buf[MAX_PATH]; + + while (1) { + strcpy((char*)&buf, template); + if (_mktemp((char*)&buf)) { + if ((fd=open((char*)&buf, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR))!=-1) { + strcpy(template, (char*)&buf); + return (fd); + } else + if (errno != EEXIST) + return (-1); + } else + return (-1); + } +#else + return(mkstemp(template)); +#endif +} + + /* * getpwuid() stuff */ @@ -349,8 +374,8 @@ wrapped_environ() } #ifdef LISP_FEATURE_WIN32 -#define WIN32_LEAN_AND_MEAN #include +#include /* * faked-up implementation of select(). Right now just enough to get through * second genesis. @@ -377,7 +402,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); } } @@ -397,31 +422,6 @@ int select(int top_fd, DWORD *read_set, DWORD *write_set, DWORD *except_set, tim } /* - * 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 @@ -435,3 +435,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 */