X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=3b195b88e1c610340588f32d9d14067d4a301e85;hb=5e291412ff095a2016388eee8ac265e12d565119;hp=1331e6de9c4adea3d9c0f9afb66d3b0d812aa6f5;hpb=21bb73db9c3f333ead8a848f863b957a6db5a5c9;p=sbcl.git

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index 1331e6d..3b195b8 100644
--- a/src/runtime/wrap.c
+++ b/src/runtime/wrap.c
@@ -30,11 +30,17 @@
 #include <string.h>
 #include <unistd.h>
 #include <pwd.h>
+#include <stdio.h>
 
-
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "util.h"
+
+/* Although it might seem as though this should be in some standard
+   Unix header, according to Perry E. Metzger, in a message on
+   sbcl-devel dated 2004-03-29, this is the POSIXly-correct way of
+   using environ: by an explicit declaration.  -- CSR, 2004-03-30 */
+extern char **environ;
    
 /*
  * stuff needed by CL:DIRECTORY and other Lisp directory operations
@@ -122,7 +128,7 @@ wrapped_readlink(char *path)
     int bufsiz = strlen(path) + 16;
     while (1) {
 	char *result = malloc(bufsiz);
-	int n_read = readlink(path, result, n_read);
+	int n_read = readlink(path, result, bufsiz);
 	if (n_read < 0) {
 	    free(result);
 	    return 0;
@@ -146,8 +152,11 @@ wrapped_readlink(char *path)
  * when values are small.
  *
  * FIXME: But of course we should fix the FFI so that we can use the
- * actual 64-bit values instead. */
-typedef long ffi_dev_t; /* since Linux dev_t can be 64 bits */
+ * 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 */
+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 */
 
 /* a representation of stat(2) results which doesn't depend on CPU or OS */
@@ -250,3 +259,44 @@ uid_username(int uid)
 	return 0;
     }
 }
+
+char *
+uid_homedir(uid_t uid)
+{
+    struct passwd *p = getpwuid(uid);
+    if(p) {
+	/* Let's be careful about this, shall we? */
+	size_t len = strlen(p->pw_dir);
+	if (p->pw_dir[len-1] == '/') {
+	    return strdup(p->pw_dir);
+	} else {
+	    char *result = malloc(len + 2);
+	    if (result) {
+		int nchars = sprintf(result,"%s/",p->pw_dir);
+		if (nchars == len + 1) {
+		    return result;
+		} else {
+		    return 0;
+		}
+	    } else {
+		return 0;
+	    }
+	}
+    } else {
+	return 0;
+    }
+}
+
+/*
+ * functions to get miscellaneous C-level variables
+ *
+ * (Doing this by calling functions lets us borrow the smarts of the C
+ * linker, so that things don't blow up when libc versions and thus
+ * variable locations change between compile time and run time.)
+ */
+
+char **
+wrapped_environ()
+{
+    return environ;
+}