X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=3b195b88e1c610340588f32d9d14067d4a301e85;hb=cce46771e6d734c275f3e2d5620004da3b5d09ee;hp=23bc88167e71b318e58e2567369fd884aa3374b2;hpb=3bd7a97d1b11a2b0aee086ef211cae807f3dfc35;p=sbcl.git

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index 23bc881..3b195b8 100644
--- a/src/runtime/wrap.c
+++ b/src/runtime/wrap.c
@@ -6,7 +6,7 @@
  * Thus, when their signature changes, they don't need updates in a .h
  * file somewhere, but they do need updates in the Lisp code. FIXME:
  * It would be nice to enforce this at compile time. It mighn't even
- * be all that hard: make the cross-compiler versions of DEF-ALIEN-FOO
+ * be all that hard: make the cross-compiler versions of DEFINE-ALIEN-FOO
  * macros accumulate strings in a list which then gets written out at
  * the end of sbcl2.h at the end of cross-compilation, then rerun
  * 'make' in src/runtime/ using the new sbcl2.h as sbcl.h (and make
@@ -29,10 +29,18 @@
 #include <stdlib.h>
 #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
@@ -120,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;
@@ -144,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 */
@@ -224,3 +235,68 @@ fstat_wrapper(int filedes, struct stat_wrapper *buf)
 	copy_to_stat_wrapper(buf, &real_buf); 
     return ret;
 }
+
+/*
+ * getpwuid() stuff
+ */
+
+/* Return a newly-allocated string holding the username for "uid", or
+ * NULL if there's no such user.
+ *
+ * KLUDGE: We also return NULL if malloc() runs out of memory
+ * (returning strdup() result) since it's not clear how to handle that
+ * error better. -- WHN 2001-12-28 */
+char *
+uid_username(int uid)
+{
+    struct passwd *p = getpwuid(uid);
+    if (p) {
+	/* The object *p is a static struct which'll be overwritten by
+	 * the next call to getpwuid(), so it'd be unsafe to return
+	 * p->pw_name without copying. */
+	return strdup(p->pw_name);
+    } else {
+	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;
+}