Add support for Unix lookup by name to user-uid and user-gid

[sxemacs] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index 08a8819..cefec89 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -381,7 +381,7 @@ static inline int
 suppressedp_loop(int len, char *nonreloc, Lisp_Object reloc)
 {
        EXTERNAL_LIST_LOOP_2(_acons_, Vload_suppress_alist) {
-               if (CONSP(acons) && STRINGP(XCAR(_acons_))) {
+               if (CONSP(_acons_) && STRINGP(XCAR(_acons_))) {
                        Lisp_Object name = XCAR(_acons_);
                        if (XSTRING_LENGTH(name) == len &&
                            !memcmp(XSTRING_DATA(name), nonreloc, len)) {
@@ -1061,6 +1061,15 @@ static int locate_file_in_directory_mapper(char *fn, void *arg)
                                                    F_SETFD, FD_CLOEXEC);
 
                                return 1;
+                       } else {
+                               /* Avoid closing stdin upon success of
+                                  access, where closure->fd would be
+                                  0 but the file is not open on that
+                                  descriptor
+                               */
+                               if(closure->fd > 0)
+                                       close(closure->fd);
+                               closure->fd=-1;
                        }
                }
        }