X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=1331e6de9c4adea3d9c0f9afb66d3b0d812aa6f5;hb=c1aeac123df223746249567a9c0d2f656d1222cb;hp=272a6f95036e8fde09a4913a8a4fdb01b190bbb9;hpb=a4e7c6bc705d739360dfaa9c3c652fd4a05d6c06;p=sbcl.git

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index 272a6f9..1331e6d 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
@@ -26,8 +26,11 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <pwd.h>
+
 
 #include "runtime.h"
 #include "sbcl.h"
@@ -50,17 +53,17 @@ is_lispy_filename(const char *filename)
 char**
 alloc_directory_lispy_filenames(const char *directory_name)
 {
-    DIR *dir_ptr;
+    DIR *dir_ptr = opendir(directory_name);
     char **result = 0;
 
-    if (dir_ptr = opendir(directory_name)) { /* if opendir success */
+    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 */
+	    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
@@ -106,6 +109,34 @@ free_directory_lispy_filenames(char** directory_lispy_filenames)
 }
 
 /*
+ * readlink(2) stuff
+ */
+
+/* a wrapped version of readlink(2):
+ *   -- If path isn't a symlink, or is a broken symlink, return 0.
+ *   -- If path is a symlink, return a newly allocated string holding
+ *      the thing it's linked to. */
+char *
+wrapped_readlink(char *path)
+{
+    int bufsiz = strlen(path) + 16;
+    while (1) {
+	char *result = malloc(bufsiz);
+	int n_read = readlink(path, result, n_read);
+	if (n_read < 0) {
+	    free(result);
+	    return 0;
+	} else if (n_read < bufsiz) {
+	    result[n_read] = 0;
+	    return result;
+	} else {
+	    free(result);
+	    bufsiz *= 2;
+	}
+    }
+}
+
+/*
  * stat(2) stuff
  */
 
@@ -195,3 +226,27 @@ 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;
+    }
+}