date and time created 82/01/18 19:21:15 by linton

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

diff --git a/usr/src/usr.bin/pascal/px/int.c b/usr/src/usr.bin/pascal/px/int.c
index c8d6df8..28e959b 100644 (file)
--- a/usr/src/usr.bin/pascal/px/int.c
+++ b/usr/src/usr.bin/pascal/px/int.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)int.c 1.1 %G%";
+static char sccsid[] = "@(#)int.c 1.4 %G%";

 
 /*
  * px - interpreter for Berkeley Pascal
 
 /*
  * px - interpreter for Berkeley Pascal


@@ -13,139 +13,127 @@ static char sccsid[] = "@(#)int.c 1.1 %G%";
  */
 
 #include       <signal.h>
  */
 
 #include       <signal.h>

+#include       "whoami.h"

 #include       "vars.h"
 #include       "objfmt.h"
 
 main(ac,av)
 
 #include       "vars.h"
 #include       "objfmt.h"
 
 main(ac,av)
 

-long   ac;
-char   **av;
+       int     ac;
+       char    **av;

 
 {
 
 {

-register long bytesread, block;
-register char *objprog, *file;
-register FILE *prog;
-struct  pxhdr pxhd;
-#define         pipe 3
-#define         pipesize 4096
+       register char *objprog, *file;
+       register long bytesread, bytestoread, block;
+       register FILE *prog;
+       struct   pxhdr pxhd;
+#      define   pipe 3

 
 

-/*
- * Initialize everything
- */
-_argc = ac;
-_argv = av;
-_nodump = 0;
+       /*
+        * Initialize everything
+        */
+       _argc = ac;
+       _argv = av;
+       _nodump = FALSE;

 \f
 \f

-/*
- * Determine how PX was invoked, and how to process the program 
- */
-if (_argv[0][0] == '-' && _argv[0][1] == 'o')
-       {
-       file = &_argv[0][2];
-       _mode = PIX;
-       }
-else if (_argc <= 1)
-       {
-       file = "obj";
-       _mode = PX;
-       }
-else if (_argv[1][0] != '-')
-       {
-       file = _argv[1];
-       _mode = PX;
-       }
-else if (_argv[1][1] == 0)
-       {
-       file = _argv[0];
-       _mode = PIPE;
-       _argc -= 1;
-       _argv[1] = _argv[0];
-       _argv = &_argv[1];
-       }
-else
-       {
-       fputs("Improper specification of object file to PX\n",stderr);
-       exit(1);
+       /*
+        * Determine how PX was invoked, and how to process the program 
+        */
+       if (_argv[0][0] == '-' && _argv[0][1] == 'o') {
+               file = &_argv[0][2];
+               _mode = PIX;
+       } else if (_argc <= 1) {
+               file = "obj";
+               _mode = PX;
+       } else if (_argv[1][0] != '-') {
+               file = _argv[1];
+               _mode = PX;
+       } else if (_argv[1][1] == 0) {
+               file = _argv[0];
+               _mode = PIPE;
+               _argc -= 1;
+               _argv[1] = _argv[0];
+               _argv = &_argv[1];
+       } else {
+               fputs("Improper specification of object file to PX\n",stderr);
+               exit(1);

        }
 \f
        }
 \f

-/*
- * Process program header information
- */
-if (_mode == PIPE)
-       read(pipe,&pxhd,sizeof(struct pxhdr));
-else
-       {
-       prog = fopen(file,"r");
-       if (prog == NULL)
-               {
-               perror(file);
-               exit(1);
+       /*
+        * Process program header information
+        */
+       if (_mode == PIPE) {
+               read(pipe,&pxhd,sizeof(struct pxhdr));
+       } else {
+               prog = fopen(file,"r");
+               if (prog == NULL) {
+                       perror(file);
+                       exit(1);

                }
                }

-       fseek(prog,HEADER_BYTES-sizeof(struct pxhdr),0);
-       fread(&pxhd,sizeof(struct pxhdr),1,prog);
+               fseek(prog,(long)(HEADER_BYTES-sizeof(struct pxhdr)),0);
+               fread(&pxhd,sizeof(struct pxhdr),1,prog);

        }
        }

-if (pxhd.maketime < createtime)
-       {
-       fprintf(stderr,"%s is obsolete and must be recompiled\n",file);
-       exit(1);
+       if (pxhd.maketime < createtime) {
+               fprintf(stderr,"%s is obsolete and must be recompiled\n",file);
+               exit(1);

        }
        }

-if (pxhd.magicnum != 0403)
-       {
-       fprintf(stderr,"%s is not a Pascal program\n",file);
-       exit(1);
+       if (pxhd.magicnum != MAGICNUM) {
+               fprintf(stderr,"%s is not a Pascal interpreter file\n",file);
+               exit(1);

        }
 \f
        }
 \f

-/*
- * Load program into memory
- */
-objprog = malloc(pxhd.objsize);
-if (_mode == PIPE)
-       {
-       bytesread = 0;
-       do
-               {
-               block = read(pipe,objprog+bytesread,pipesize);
-               bytesread += block;
-               }
-               while (block);
-       }
-else
-       {
-       bytesread = fread(objprog,1,pxhd.objsize,prog);
-       fclose(prog);
-       if (_mode == PIX)
-               unlink(file);
+       /*
+        * Load program into memory
+        */
+       objprog = malloc((int)pxhd.objsize);
+       if (_mode == PIPE) {
+               bytestoread = pxhd.objsize;
+               bytesread = 0;
+               do      {
+                       block = read(pipe,(int)(objprog+bytesread),bytestoread);
+                       if (block > 0) {
+                               bytesread += block;
+                               bytestoread -= block;
+                       }
+               } while (block > 0);
+       } else {
+               bytesread = fread(objprog,1,(int)pxhd.objsize,prog);
+               fclose(prog);
+               if (_mode == PIX)
+                       unlink(file);

        }
        }

-if (bytesread != pxhd.objsize)
-       {
-       fprintf(stderr,"Read error occurred while loading %s\n",file);
-       exit(1);
+       if (bytesread != pxhd.objsize) {
+               fprintf(stderr,"Read error occurred while loading %s\n",file);
+               exit(1);

        }
        }

-if (_mode == PIX)
-       fputs("Execution begins...\n",stderr);
-/*
- * set interpreter to catch expected signals and begin interpretation
- */
-signal(SIGILL,syserr);
-signal(SIGBUS,syserr);
-signal(SIGSYS,syserr);
-if (signal(SIGINT,SIG_IGN) != SIG_IGN)
-       signal(SIGINT,intr);
-signal(SIGSEGV,memsize);
-signal(SIGFPE,except);
-signal(SIGTRAP,liberr);
-interpreter(objprog);
-/*
- * reset signals, deallocate memory, and exit normally
- */
-signal(SIGINT,SIG_IGN);
-signal(SIGSEGV,SIG_DFL);
-signal(SIGFPE,SIG_DFL);
-signal(SIGTRAP,SIG_DFL);
-signal(SIGILL,SIG_DFL);
-signal(SIGBUS,SIG_DFL);
-signal(SIGSYS,SIG_DFL);
-PFLUSH();
-/* pfree(objprog); */
-psexit(0);
+       if (_mode == PIX)
+               fputs("Execution begins...\n",stderr);
+       /*
+        * set interpreter to catch expected signals and begin interpretation
+        */
+       signal(SIGILL,syserr);
+       signal(SIGBUS,syserr);
+       signal(SIGSYS,syserr);
+       if (signal(SIGINT,SIG_IGN) != SIG_IGN)
+               signal(SIGINT,intr);
+       signal(SIGSEGV,memsize);
+       signal(SIGFPE,except);
+       signal(SIGTRAP,liberr);
+       /*
+        * do it
+        */
+       interpreter(objprog);
+       /*
+        * reset signals, deallocate memory, and exit normally
+        */
+       signal(SIGINT,SIG_IGN);
+       signal(SIGSEGV,SIG_DFL);
+       signal(SIGFPE,SIG_DFL);
+       signal(SIGTRAP,SIG_DFL);
+       signal(SIGILL,SIG_DFL);
+       signal(SIGBUS,SIG_DFL);
+       signal(SIGSYS,SIG_DFL);
+       PFLUSH();
+       /* pfree(objprog); */
+       psexit(0);

 }
 }