BSD 4_4_Lite2 release

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

diff --git a/usr/src/usr.bin/pascal/src/main.c b/usr/src/usr.bin/pascal/src/main.c
index e14d71a..9159cbb 100644 (file)
--- a/usr/src/usr.bin/pascal/src/main.c
+++ b/usr/src/usr.bin/pascal/src/main.c
@@ -1,11 +1,45 @@
-/* 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
 
 #ifndef lint

-static char copyright[] =
-           "@(#)Copyright (c) 1979 Regents of the University of California";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */

 
 

-static char sccsid[] = "@(#)main.c 2.3 %G%";
-#endif
+#ifndef lint
+static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 5/24/94";
+#endif /* not lint */

 
 #include "whoami.h"
 #include "0.h"
 
 #include "whoami.h"
 #include "0.h"


@@ -72,7 +106,6 @@ main(argc, argv)
        register c;
        FILE *fopen();
        extern char *myctime();
        register c;
        FILE *fopen();
        extern char *myctime();

-       extern long lseek();

        int i;
 
        if (argv[0][0] == 'a')
        int i;
 
        if (argv[0][0] == 'a')


@@ -106,10 +139,10 @@ main(argc, argv)
        }
 #      ifdef OBJ
            opt('p') = opt('t') = opt('b') = 1;
        }
 #      ifdef OBJ
            opt('p') = opt('t') = opt('b') = 1;

-#ifdef vax
-           /* pdx is currently supported only on the vax */
+#if defined(vax) || defined(tahoe)
+           /* pdx is currently supported on the vax and the tahoe */

            opt('g') = 1;
            opt('g') = 1;

-#endif vax
+#endif

            while (argc > 0) {
                    cp = argv[0];
                    if (*cp++ != '-')
            while (argc > 0) {
                    cp = argv[0];
                    if (*cp++ != '-')


@@ -411,7 +444,8 @@ geterr(seekpt, buf)
        char *buf;
 {
 
        char *buf;
 {
 

-       (void) lseek(efil, (long) seekpt, 0);
+       if (lseek(efil, (off_t) seekpt, 0) == -1)
+               perror(err_file), pexit(DIED);

        if (read(efil, buf, 256) <= 0)
                perror(err_file), pexit(DIED);
 }
        if (read(efil, buf, 256) <= 0)
                perror(err_file), pexit(DIED);
 }