BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / make / parse.c

diff --git a/usr/src/usr.bin/make/parse.c b/usr/src/usr.bin/make/parse.c
index 4bb93c3..c5578a6 100644 (file)
--- a/usr/src/usr.bin/make/parse.c
+++ b/usr/src/usr.bin/make/parse.c
@@ -7,23 +7,37 @@
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)parse.c    5.16 (Berkeley) 6/29/90";
+static char sccsid[] = "@(#)parse.c    5.18 (Berkeley) 2/19/91";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -1616,7 +1630,7 @@ ParseDoInclude (file)
        /*
         * Pop to previous file
         */
        /*
         * Pop to previous file
         */

-       (void) ParseEOF();
+       (void) ParseEOF(0);

     }
 }
 
     }
 }
 


@@ -1636,7 +1650,8 @@ ParseDoInclude (file)
  *---------------------------------------------------------------------
  */
 static int
  *---------------------------------------------------------------------
  */
 static int

-ParseEOF ()
+ParseEOF (opened)
+    int opened;

 {
     IFile     *ifile;  /* the state on the top of the includes stack */
 
 {
     IFile     *ifile;  /* the state on the top of the includes stack */
 


@@ -1648,7 +1663,8 @@ ParseEOF ()
     free (fname);
     fname = ifile->fname;
     lineno = ifile->lineno;
     free (fname);
     fname = ifile->fname;
     lineno = ifile->lineno;

-    fclose (curFILE);
+    if (opened)
+       (void) fclose (curFILE);

     curFILE = ifile->F;
     free ((Address)ifile);
     return (CONTINUE);
     curFILE = ifile->F;
     free ((Address)ifile);
     return (CONTINUE);


@@ -2111,7 +2127,7 @@ Parse_File(name, stream)
        /*
         * Reached EOF, but it may be just EOF of an include file... 
         */
        /*
         * Reached EOF, but it may be just EOF of an include file... 
         */

-    } while (ParseEOF() == CONTINUE);
+    } while (ParseEOF(1) == CONTINUE);

 
     /*
      * Make sure conditionals are clean
 
     /*
      * Make sure conditionals are clean


@@ -2186,7 +2202,7 @@ Parse_MainName()
     main = Lst_Init (FALSE);
 
     if (mainNode == NILGNODE) {
     main = Lst_Init (FALSE);
 
     if (mainNode == NILGNODE) {

-       Punt ("I don't know what to DO!\n");
+       Punt ("make: no target to make.\n");

        /*NOTREACHED*/
     } else if (mainNode->type & OP_DOUBLEDEP) {
        Lst_Concat(main, mainNode->cohorts, LST_CONCNEW);
        /*NOTREACHED*/
     } else if (mainNode->type & OP_DOUBLEDEP) {
        Lst_Concat(main, mainNode->cohorts, LST_CONCNEW);