Merge branch 'master' into nhmall-booktribute

sys/share/lev_lex.c

@@ -1175,6 +1175,7 @@ void FDECL(init_yyout, (FILE *));
 long NDECL(handle_varstring_check);
 long FDECL(corefunc_str_check, (char *, long));
 
+extern void VDECL(lc_error, (const char *, ...));
 extern struct lc_vardefs *FDECL(vardef_defined,(struct lc_vardefs *,char *, int));
 
 extern struct lc_vardefs *variable_definitions;

sys/share/pcmain.c

@@ -405,7 +405,7 @@ char *argv[];
 		hackpid = 1;
 #endif
 		write(fd, (genericptr_t) &hackpid, sizeof(hackpid));
-		close(fd);
+		nhclose(fd);
 	}
 #ifdef MFLOPPY
 	level_info[0].where = ACTIVE;

sys/share/pcsys.c

@@ -282,7 +282,7 @@ int start;
 	if (sysflags.asksavedisk) {
 		/* Don't prompt if you can find the save file */
 		if ((fd = open_savefile()) >= 0) {
-			(void) close(fd);
+			(void) nhclose(fd);
 			return 1;
 		}
 		clear_nhwindow(WIN_MESSAGE);
@@ -335,7 +335,7 @@ comspec_exists()
 
 	if ((comspec = getcomspec()))
 		if ((fd = open(comspec, O_RDONLY)) >= 0) {
-			(void) close(fd);
+			(void) nhclose(fd);
 			return TRUE;
 		}
 	return FALSE;

sys/share/pcunix.c

@@ -150,7 +150,7 @@ getlock()
 		error("Cannot open %s", fq_lock);
 	}
 
-	(void) close(fd);
+	(void) nhclose(fd);
 
 	if(iflags.window_inited) { 
 # ifdef SELF_RECOVER
@@ -248,7 +248,7 @@ gotlock:
 # endif
 			error("cannot write lock (%s)", fq_lock);
 		}
-		if(close(fd) == -1) {
+		if(nhclose(fd) == -1) {
 # if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
 			chdirx(orgdir, 0);
 # endif