X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=a510702172e95c46b9ca34e416843d1c15e484b1;hb=8a632c14b592472873cfb214239c9387bc1a1ced;hp=153ebd5f90f34516c645198ee4450126c8221025;hpb=10cdee0326e9e8a5bbfe1d8312a73d58f023fb5f;p=sbcl.git diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c index 153ebd5..a510702 100644 --- a/src/runtime/wrap.c +++ b/src/runtime/wrap.c @@ -32,6 +32,8 @@ #include #include #include +#include +#include #ifndef LISP_FEATURE_WIN32 #include #include @@ -39,8 +41,15 @@ #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 @@ -151,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) @@ -292,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 */ @@ -360,7 +374,6 @@ wrapped_environ() } #ifdef LISP_FEATURE_WIN32 -#define WIN32_LEAN_AND_MEAN #include #include /* @@ -452,9 +465,9 @@ int wifstopped(int 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) @@ -477,6 +490,7 @@ int s_isfifo(mode_t mode) { return S_ISFIFO(mode); } +#ifndef LISP_FEATURE_WIN32 int s_islnk(mode_t mode) { #ifdef S_ISLNK