BSD 4_4 release

[unix-history] / usr / src / usr.bin / pascal / pxp / error.c

diff --git a/usr/src/usr.bin/pascal/pxp/error.c b/usr/src/usr.bin/pascal/pxp/error.c
index be1b708..ef66144 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/error.c
+++ b/usr/src/usr.bin/pascal/pxp/error.c
@@ -1,5 +1,40 @@
-static char *sccsid = "@(#)error.c     1.2 (Berkeley) %G%";
-/* Copyright (c) 1979 Regents of the University of California */
+/*-
+ * Copyright (c) 1980, 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.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)error.c    8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+

 /*
  * pi - Pascal interpreter code translator
  *
 /*
  * pi - Pascal interpreter code translator
  *


@@ -13,6 +48,7 @@ static        char *sccsid = "@(#)error.c     1.2 (Berkeley) %G%";
  * Version 1.2 January 1979
  */
 
  * Version 1.2 January 1979
  */
 

+#include "whoami.h"

 #include "0.h"
 #include "yy.h"
 
 #include "0.h"
 #include "yy.h"
 


@@ -21,7 +57,7 @@ extern        int yyline;
 extern char errout;
 #endif
 
 extern char errout;
 #endif
 

-char   errpfx  'E';
+char   errpfx  = 'E';

 extern int yyline;
 /*
  * Panic is called when impossible
 extern int yyline;
 /*
  * Panic is called when impossible


@@ -91,7 +127,7 @@ error(a1, a2, a3, a4)
 #ifdef PI
        if (errpfx == ' ') {
                printf("  ");
 #ifdef PI
        if (errpfx == ' ') {
                printf("  ");

-               for (i = line; i >= 10; i =/ 10)
+               for (i = line; i >= 10; i /= 10)

                        putchar(' ');
                printf("... ");
        } else if (Enoline)
                        putchar(' ');
                printf("... ");
        } else if (Enoline)