X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwrap.c;h=bf6088c3a6f79191948f26b142b07a74ec976532;hb=683874b497a99cd2c11b6c5d9b47e2785b1ede5f;hp=d8b47aebe13159ef40b853fc90f640dea1aa4853;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git

diff --git a/src/runtime/wrap.c b/src/runtime/wrap.c
index d8b47ae..bf6088c 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,9 +26,12 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "runtime.h"
+#include "sbcl.h"
 #include "util.h"
    
 /*
@@ -48,17 +51,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
@@ -104,10 +107,46 @@ 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
  */
 
-typedef long my_dev_t;
+/* 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. */
+typedef long 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 */
 struct stat_wrapper {
@@ -121,14 +160,14 @@ struct stat_wrapper {
      * 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 */
-    my_dev_t      wrapped_st_dev;         /* device */
+    ffi_dev_t     wrapped_st_dev;         /* device */
     ino_t         wrapped_st_ino;         /* inode */
     mode_t        wrapped_st_mode;        /* protection */
     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 */
-    my_dev_t      wrapped_st_rdev;        /* device type (if inode device) */
-    off_t         wrapped_st_size;        /* total size, in bytes */
+    ffi_dev_t     wrapped_st_rdev;        /* device type (if inode device) */
+    ffi_off_t     wrapped_st_size;        /* total size, in bytes */
     unsigned long 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 */