BSD 4_4 release

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

diff --git a/usr/src/usr.bin/pascal/src/proc.c b/usr/src/usr.bin/pascal/src/proc.c
index 349f224..2cb28b4 100644 (file)
--- a/usr/src/usr.bin/pascal/src/proc.c
+++ b/usr/src/usr.bin/pascal/src/proc.c
@@ -1,8 +1,39 @@
-/* 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 sccsid[] = "@(#)proc.c 1.21 %G%";
-#endif
+static char sccsid[] = "@(#)proc.c     8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

 
 #include "whoami.h"
 #ifdef OBJ
 
 #include "whoami.h"
 #ifdef OBJ


@@ -735,15 +766,35 @@ proc(r)
                                 * var := file ^;
                                 */
                                if (file != NIL)
                                 * var := file ^;
                                 */
                                if (file != NIL)

-                                       (void) stklval(file, NIL );
+                                   (void) stklval(file, NIL);

                                else /* Magic */
                                else /* Magic */

-                                       (void) put(2, PTR_RV, (int)input->value[0]);
+                                   (void) put(2, PTR_RV, (int)input->value[0]);

                                (void) put(1, O_FNIL);
                                (void) put(1, O_FNIL);

-                               (void) put(2, O_IND, width(filetype));
-                               convert(filetype, ap);
-                               if (isa(ap, "bsci"))
-                                       rangechk(ap, ap);
-                               (void) put(2, O_AS, width(ap));
+                               if (isa(filetype, "bcsi")) {
+                                   int filewidth = width(filetype);
+
+                                   switch (filewidth) {
+                                       case 4:
+                                           (void) put(1, O_IND4);
+                                           break;
+                                       case 2:
+                                           (void) put(1, O_IND2);
+                                           break;
+                                       case 1:
+                                           (void) put(1, O_IND1);
+                                           break;
+                                       default:
+                                           (void) put(2, O_IND, filewidth);
+                                   }
+                                   convert(filetype, ap);
+                                   rangechk(ap, ap);
+                                   (void) gen(O_AS2, O_AS2,
+                                           filewidth, width(ap));
+                               } else {
+                                   (void) put(2, O_IND, width(filetype));
+                                   convert(filetype, ap);
+                                   (void) put(2, O_AS, width(ap));
+                               }

                                /*
                                 * get(file);
                                 */
                                /*
                                 * get(file);
                                 */