Merge branch 'master' into nhb-rewrite-version-parser

Picking up the version array cache updates.

Author: nbriggs

src/dsk.c

@@ -66,6 +66,7 @@ typedef struct filename_entry {
  */
 static struct {
   char name[MAXPATHLEN];     /* lowercase unversioned file name */
+  ino_t dir_ino;             /* inode of the directory */
   struct timespec lastMTime; /* modification time of the directory */
   int allocated;             /* number of entries in the files array */
   int lastUsed;              /* index of the last entry in use in files array */
@@ -3055,11 +3056,13 @@ static int get_version_array(char *dir, char *file)
     *Lisp_errno = errno;
     return(0);
   }
-  if (0 == strcmp(lcased_file, VA.name) &&
+  if (sbuf.st_ino == VA.dir_ino &&
+      0 == strcmp(lcased_file, VA.name) &&
       sbuf.st_mtim.tv_sec == VA.lastMTime.tv_sec &&
       sbuf.st_mtim.tv_nsec == VA.lastMTime.tv_nsec) {
     return (1);
   } else {
+    VA.dir_ino = sbuf.st_ino;
     VA.lastMTime = sbuf.st_mtim;
     strcpy(VA.name, lcased_file);
   }

src/subr.c

@@ -416,11 +416,11 @@ void OP_subrcall(int subr_no, int argnum) {
     case sb_LISP_FINISH: {
       int status;
       POP_SUBR_ARGS;
-      if (argnum == 0 || args[0] == NIL || args[0] == ATOM_T)
-        lisp_finish(EXIT_SUCCESS);
-      N_GETNUMBER(args[0], status, exit_fail);
+      if (argnum == 0 || argnum == 1 || (argnum == 2 && args[1] == NIL)) lisp_finish(EXIT_SUCCESS);
+      if (argnum > 2) lisp_finish(EXIT_FAILURE);
+      N_GETNUMBER(args[1], status, exit_fail);
       lisp_finish(status);
-      exit_fail:
+    exit_fail:
       lisp_finish(EXIT_FAILURE);
       break;
     }