BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / amd / fsinfo / fsi_lex.l

diff --git a/usr/src/usr.sbin/amd/fsinfo/fsi_lex.l b/usr/src/usr.sbin/amd/fsinfo/fsi_lex.l
index cb1d0d7..a74de5b 100644 (file)
--- a/usr/src/usr.sbin/amd/fsinfo/fsi_lex.l
+++ b/usr/src/usr.sbin/amd/fsinfo/fsi_lex.l
@@ -1,7 +1,5 @@
 %{
 /*
 %{
 /*

- * $Id: fsi_lex.l,v 5.2.1.2 90/12/21 16:41:55 jsp Alpha $
- *

  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.
  * Copyright (c) 1989 Jan-Simon Pendry
  * Copyright (c) 1989 Imperial College of Science, Technology & Medicine
  * Copyright (c) 1989 The Regents of the University of California.


@@ -10,9 +8,38 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * %sccs.include.redist.c%
+ * 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.
+ *
+ *     @(#)fsi_lex.l   5.4 (Berkeley) 6/26/91
+ *
+ * $Id: fsi_lex.l,v 5.2.1.3 91/05/07 22:19:03 jsp Alpha $

  *
  *

- *     @(#)fsi_lex.l   5.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -214,7 +241,7 @@ int yywrap()
 static int first = 1;
        if (first) {
                char prog[16*1024];
 static int first = 1;
        if (first) {
                char prog[16*1024];

-               strcpy(prog, "for file in ");
+               strcpy(prog, "cpp=cat; test -r /lib/cpp && cpp=/lib/cpp; test -r /usr/libexec/cpp && cpp=/usr/libexec/cpp; for file in ");

                while (*++g_argv) {
                        if (access(*g_argv, 4) < 0) {
                                error("\"%s\": Cannot open for reading", *g_argv);
                while (*++g_argv) {
                        if (access(*g_argv, 4) < 0) {
                                error("\"%s\": Cannot open for reading", *g_argv);


@@ -224,7 +251,7 @@ static int first = 1;
                                strcat(prog, " ");
                        }
                }
                                strcat(prog, " ");
                        }
                }

-               strcat(prog, "; do /lib/cpp ");
+               strcat(prog, "; do $cpp ");

                strcat(prog, idvbuf);
                strcat(prog, " -DHOSTNAME=\'");
                strcat(prog, hostname);
                strcat(prog, idvbuf);
                strcat(prog, " -DHOSTNAME=\'");
                strcat(prog, hostname);