Throw errors on malformed FUNCTION.

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

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index 8493bf6..3f174f3 100644 (file)
--- a/src/runtime/wrap.c
+++ b/src/runtime/wrap.c
@@ -118,7 +118,7 @@ char * sb_realpath (char *path)
 
     if ((ret = calloc(MAX_PATH, sizeof(char))) == NULL)
         return NULL;
-    if (GetFullPathName(path, MAX_PATH, ret, cp) == 0) {
+    if (GetFullPathName(path, MAX_PATH, ret, &cp) == 0) {
         errnum = errno;
         free(ret);
         errno = errnum;
@@ -317,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] == '/') {
@@ -342,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 */
 \f
 /*
@@ -412,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;
 }