BSD 4_4 release

[unix-history] / usr / src / usr.bin / pascal / libpc / FNIL.c

diff --git a/usr/src/usr.bin/pascal/libpc/FNIL.c b/usr/src/usr.bin/pascal/libpc/FNIL.c
index 97daa8b..9a639fc 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/FNIL.c
+++ b/usr/src/usr.bin/pascal/libpc/FNIL.c
@@ -1,9 +1,41 @@
-/* Copyright (c) 1979 Regents of the University of California */
+/*-
+ * Copyright (c) 1979, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */

 
 

-static char sccsid[] = "@(#)FNIL.c 1.2 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)FNIL.c     8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "h00vars.h"
 
 #include "h00vars.h"

-#include "h01errs.h"

 
 char *
 FNIL(curfile)
 
 char *
 FNIL(curfile)


@@ -11,12 +43,10 @@ FNIL(curfile)
        register struct iorec   *curfile;
 {
        if (curfile->fblk >= MAXFILES || _actfile[curfile->fblk] != curfile) {
        register struct iorec   *curfile;
 {
        if (curfile->fblk >= MAXFILES || _actfile[curfile->fblk] != curfile) {

-               ERROR(ENOFILE, 0);
-               return;
+               ERROR("Reference to an inactive file\n", 0);

        }
        if (curfile->funit & FDEF) {
        }
        if (curfile->funit & FDEF) {

-               ERROR(EREFINAF, curfile->pfname);
-               return;
+               ERROR("%s: Reference to an inactive file\n", curfile->pfname);

        }
        if (curfile->funit & FREAD) {
                IOSYNC(curfile);
        }
        if (curfile->funit & FREAD) {
                IOSYNC(curfile);