X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=3f174f368cb554abb26fdb09beac651ef21d6593;hb=bf40ae88bc289fd765a33861cc4bc0853ed483ba;hp=1fad2d79f1b5b63caf136af2cbbddd551d0adb69;hpb=fd5fbfdd4d43c3d88c61f4d3240100b9333f4675;p=sbcl.git diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c index 1fad2d7..3f174f3 100644 --- a/src/runtime/wrap.c +++ b/src/runtime/wrap.c @@ -32,6 +32,10 @@ #include #include #include +#include +#include +#include + #ifndef LISP_FEATURE_WIN32 #include #include @@ -39,8 +43,14 @@ #endif #include +#if defined(LISP_FEATURE_WIN32) +#define WIN32_LEAN_AND_MEAN +#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 @@ -52,73 +62,6 @@ extern char **environ; * stuff needed by CL:DIRECTORY and other Lisp directory operations */ -/* Unix directory operations think of "." and ".." as filenames, but - * Lisp directory operations do not. */ -int -is_lispy_filename(const char *filename) -{ - return strcmp(filename, ".") && strcmp(filename, ".."); -} - -/* Return a zero-terminated array of strings holding the Lispy filenames - * (i.e. excluding the Unix magic "." and "..") in the named directory. */ -char** -alloc_directory_lispy_filenames(const char *directory_name) -{ - DIR *dir_ptr = opendir(directory_name); - char **result = 0; - - if (dir_ptr) { /* if opendir success */ - - struct voidacc va; - - if (0 == voidacc_ctor(&va)) { /* if voidacc_ctor success */ - struct dirent *dirent_ptr; - - while ( (dirent_ptr = readdir(dir_ptr)) ) { /* until end of data */ - char* original_name = dirent_ptr->d_name; - if (is_lispy_filename(original_name)) { - /* strdup(3) is in Linux and *BSD. If you port - * somewhere else that doesn't have it, it's easy - * to reimplement. */ - char* dup_name = strdup(original_name); - if (!dup_name) { /* if strdup failure */ - goto dtors; - } - if (voidacc_acc(&va, dup_name)) { /* if acc failure */ - goto dtors; - } - } - } - result = (char**)voidacc_give_away_result(&va); - } - - dtors: - voidacc_dtor(&va); - /* ignoring closedir(3) return code, since what could we do? - * - * "Never ask questions you don't want to know the answer to." - * -- William Irving Zumwalt (Rich Cook, _The Wizardry Quested_) */ - closedir(dir_ptr); - } - - return result; -} - -/* Free a result returned by alloc_directory_lispy_filenames(). */ -void -free_directory_lispy_filenames(char** directory_lispy_filenames) -{ - char** p; - - /* Free the strings. */ - for (p = directory_lispy_filenames; *p; ++p) { - free(*p); - } - - /* Free the table of strings. */ - free(directory_lispy_filenames); -} /* * readlink(2) stuff @@ -151,74 +94,79 @@ 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 */ - -#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; +char * sb_realpath (char *path) +{ +#ifndef LISP_FEATURE_WIN32 + 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 -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 */ + 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 +} + +/* readdir, closedir, and dirent name accessor. The first three are not strictly + * necessary, but should save us some #!+netbsd in the build, and this also allows + * building Windows versions using the non-ANSI variants of FindFirstFile &co + * under the same API. (Use a structure that appends the handle to the WIN32_FIND_DATA + * as the return value from sb_opendir, on sb_readdir grab the name from the previous + * call and save the new one.) Nikodemus thought he would have to do that to support + * DIRECTORY on UNC paths, but turns out opendir &co do TRT on Windows already -- so + * leaving that bit of tedium for a later date, once we figure out the whole *A vs. *W + * issue out properly. ...FIXME, obviously, as per above. + * + * Once that is done, the lisp side functions are best named OS-OPENDIR, etc. + */ +extern DIR * +sb_opendir(char * name) +{ + return opendir(name); +} -#ifdef LISP_FEATURE_OS_PROVIDES_BLKSIZE_T -typedef blksize_t ffi_blksize_t; -#else -typedef unsigned long ffi_blksize_t; -#endif +extern struct dirent * +sb_readdir(DIR * dirp) +{ + return readdir(dirp); +} -/* 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 */ -#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 */ -#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 */ -#endif - ffi_dev_t wrapped_st_rdev; /* device type (if inode device) */ - ffi_off_t wrapped_st_size; /* total size, in bytes */ - 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 */ - time_t wrapped_st_ctime; /* time_t of last change */ -}; +extern int +sb_closedir(DIR * dirp) +{ + return closedir(dirp); +} + +extern char * +sb_dirent_name(struct dirent * ent) +{ + return ent->d_name; +} + +/* + * stat(2) stuff + */ static void copy_to_stat_wrapper(struct stat_wrapper *to, struct stat *from) @@ -304,6 +252,45 @@ fstat_wrapper(int filedes, struct stat_wrapper *buf) return ret; } +/* A wrapper for mkstemp(3), for two reasons: (1) mkstemp does not + exist on Windows; (2) by passing down a mode_t, we don't need a + binding to chmod in SB-UNIX, and need not concern ourselves with + umask issues if we want to use mkstemp to make new files in + OPEN. */ +int sb_mkstemp (char *template, mode_t mode) { +#ifdef LISP_FEATURE_WIN32 +#define PATHNAME_BUFFER_SIZE MAX_PATH +#define MKTEMP _mktemp +#else +#define PATHNAME_BUFFER_SIZE PATH_MAX +#define MKTEMP mktemp +#endif + int fd; + char buf[PATHNAME_BUFFER_SIZE]; + + while (1) { + /* Fruit fallen from the tree: for people who like + microoptimizations, we might not need to copy the whole + template on every loop, but only the last several characters. + But I didn't feel like testing the boundary cases in Windows's + _mktemp. */ + strncpy(buf, template, PATHNAME_BUFFER_SIZE); + buf[PATHNAME_BUFFER_SIZE-1]=0; /* force NULL-termination */ + if (MKTEMP(buf)) { + if ((fd=open(buf, O_CREAT|O_EXCL|O_RDWR, mode))!=-1) { + strcpy(template, buf); + return (fd); + } else + if (errno != EEXIST) + return (-1); + } else + return (-1); + } +#undef MKTEMP +#undef PATHNAME_BUFFER_SIZE +} + + /* * getpwuid() stuff */ @@ -330,10 +317,9 @@ uid_username(int uid) } char * -uid_homedir(uid_t uid) +passwd_homedir(struct passwd *p) { - struct passwd *p = getpwuid(uid); - if(p) { + if (p) { /* Let's be careful about this, shall we? */ size_t len = strlen(p->pw_dir); if (p->pw_dir[len-1] == '/') { @@ -341,7 +327,7 @@ uid_homedir(uid_t uid) } else { char *result = malloc(len + 2); if (result) { - int nchars = sprintf(result,"%s/",p->pw_dir); + unsigned int nchars = sprintf(result,"%s/",p->pw_dir); if (nchars == len + 1) { return result; } else { @@ -355,6 +341,18 @@ uid_homedir(uid_t uid) return 0; } } + +char * +user_homedir(char *name) +{ + return passwd_homedir(getpwnam(name)); +} + +char * +uid_homedir(uid_t uid) +{ + return passwd_homedir(getpwuid(uid)); +} #endif /* !LISP_FEATURE_WIN32 */ /* @@ -372,7 +370,6 @@ wrapped_environ() } #ifdef LISP_FEATURE_WIN32 -#define WIN32_LEAN_AND_MEAN #include #include /* @@ -426,10 +423,18 @@ int select(int top_fd, DWORD *read_set, DWORD *write_set, DWORD *except_set, tim * yet, however, and the closest we can easily get to a timeval is the * seconds part. So that's what we do. */ +#define UNIX_EPOCH_FILETIME 116444736000000000ULL + int gettimeofday(long *timeval, long *timezone) { - timeval[0] = time(NULL); - timeval[1] = 0; + FILETIME ft; + ULARGE_INTEGER uft; + GetSystemTimeAsFileTime(&ft); + uft.LowPart = ft.dwLowDateTime; + uft.HighPart = ft.dwHighDateTime; + uft.QuadPart -= UNIX_EPOCH_FILETIME; + timeval[0] = uft.QuadPart / 10000000; + timeval[1] = (uft.QuadPart % 10000000)/10; return 0; }