386BSD 0.1 development

[unix-history] / usr / src / usr.bin / m4 / eval.c

diff --git a/usr/src/usr.bin/m4/eval.c b/usr/src/usr.bin/m4/eval.c
index f524d66..10fd441 100644 (file)
--- a/usr/src/usr.bin/m4/eval.c
+++ b/usr/src/usr.bin/m4/eval.c
@@ -5,21 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Ozan Yigit.
  *
  * This code is derived from software contributed to Berkeley by
  * Ozan Yigit.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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[] = "@(#)eval.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)eval.c     5.4 (Berkeley) 2/26/91";

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


@@ -28,12 +44,14 @@ static char sccsid[] = "@(#)eval.c  5.1 (Berkeley) %G%";
  * by: oz
  */
 
  * by: oz
  */
 

+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 #include "mdef.h"
 #include "extr.h"
 
 extern ndptr lookup();
 #include "mdef.h"
 #include "extr.h"
 
 extern ndptr lookup();

-extern char *strsave();
-extern char *mktemp();

 
 /*
  * eval - evaluate built-in macros.
 
 /*
  * eval - evaluate built-in macros.


@@ -147,8 +165,6 @@ register int  td;
                        pbnum(atoi(argv[2]) - 1);
                break;
 
                        pbnum(atoi(argv[2]) - 1);
                break;
 

-#if unix || vms
-

        case SYSCTYPE:
                /*
                 * dosys - execute system command
        case SYSCTYPE:
                /*
                 * dosys - execute system command


@@ -165,7 +181,6 @@ register int  td;
                 */
                pbnum(sysval);
                break;
                 */
                pbnum(sysval);
                break;

-#endif

 
        case INCLTYPE:
                if (argc > 2)
 
        case INCLTYPE:
                if (argc > 2)


@@ -335,7 +350,7 @@ register int  td;
                 * dom4wrap - set up for wrap-up/wind-down activity
                 *
                 */
                 * dom4wrap - set up for wrap-up/wind-down activity
                 *
                 */

-               m4wraps = (argc > 2) ? strsave(argv[2]) : null;
+               m4wraps = (argc > 2) ? strdup(argv[2]) : null;

                break;
 
        case EXITTYPE:
                break;
 
        case EXITTYPE: