sh: ANSIfy main.c

diff --git a/Applications/V7/cmd/sh/args.c b/Applications/V7/cmd/sh/args.c
index 5556fdc..e02e645 100644 (file)
--- a/Applications/V7/cmd/sh/args.c
+++ b/Applications/V7/cmd/sh/args.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include       "defs.h"
 
-static STRING *copyargs(STRING from[], int n);
+static STRING *copyargs(const char *from[], int n);
 static DOLPTR dolh;
 
 CHAR flagadr[10];
@@ -30,12 +30,12 @@ int flagval[] = {
 /* ========    option handling ======== */
 
 
-int options(int argc, STRING *argv)
+int options(int argc, const char **argv)
 {
-       register STRING cp;
-       register STRING *argp = argv;
-       register STRING flagc;
-       STRING flagp;
+       register const char *cp;
+       register const char **argp = argv;
+       register char *flagc;
+       char *flagp;
 
        if (argc > 1 && *argp[1] == '-') {
                cp = argp[1];
@@ -55,30 +55,23 @@ int options(int argc, STRING *argv)
                                argc--;
                        } else {
                                failed(argv[1], badopt);
-                               ;
                        }
-                       ;
                }
                argp[1] = argp[0];
                argc--;
-               ;
        }
 
        /* set up $- */
        flagc = flagchar;
        flagp = flagadr;
        while (*flagc) {
-               if (flags & flagval[flagc - flagchar]
-                   ) {
+               if (flags & flagval[flagc - flagchar]) {
                        *flagp++ = *flagc;
-                       ;
                }
                flagc++;
-               ;
        }
        *flagp++ = 0;
-
-       return (argc);
+       return argc;
 }
 
 void setargs(const char *argi[])
@@ -116,12 +109,12 @@ DOLPTR freeargs(DOLPTR blk)
        return (argr);
 }
 
-static STRING *copyargs(STRING from[], int n)
+static STRING *copyargs(const char *from[], int n)
 {
-       register STRING *np =
+       register char **np =
            (STRING *) alloc(sizeof(STRING *) * n + 3 * BYTESPERWORD);
-       register STRING *fp = from;
-       register STRING *pp = np;
+       register const char **fp = from;
+       register char **pp = np;
 
        ((DOLPTR) np)->doluse = 1;      /* use count */
        np = (STRING *) ((DOLPTR) np)->dolarg;

diff --git a/Applications/V7/cmd/sh/defs.h b/Applications/V7/cmd/sh/defs.h
index cf9ceae..eb02b74 100644 (file)
--- a/Applications/V7/cmd/sh/defs.h
+++ b/Applications/V7/cmd/sh/defs.h
@@ -194,7 +194,7 @@ extern FILE standin;
 #define input  (standin->fdes)
 #define eof    (standin->feof)
 extern int peekc;
-extern STRING comdiv;
+extern const char *comdiv;
 extern const char devnull[];
 
 /* flags */
@@ -284,7 +284,7 @@ extern address end[];
 #include       "ctype.h"
 
 /* args.c */
-extern int options(int argc, STRING *argv);
+extern int options(int argc, const char *argv[]);
 extern void setargs(const char *argi[]);
 extern DOLPTR freeargs(DOLPTR blk);
 extern void clearup(void);
@@ -307,6 +307,11 @@ extern void error(const char *s);
 extern void exitsh(int xno);
 extern void done(void);
 extern void rmtemp(IOPTR base);
+/* main.c */
+extern int main(int c, const char *v[]);
+extern void chkpr(char eor);
+extern void settmp(void);
+extern void Ldup(register int fa, register int fb);
 /* print.c */
 extern void newline(void);
 extern void blank(void);

diff --git a/Applications/V7/cmd/sh/main.c b/Applications/V7/cmd/sh/main.c
index 99ed44a..765640f 100644 (file)
--- a/Applications/V7/cmd/sh/main.c
+++ b/Applications/V7/cmd/sh/main.c
@@ -26,14 +26,9 @@ CHAR tmpout[20] = "/tmp/sh-";
 FILEBLK stdfile;
 FILE standin = &stdfile;
 
-static void exfile();
+static void exfile(BOOL);
 
-
-
-
-main(c, v)
-int c;
-STRING v[];
+int main(int c, const char *v[])
 {
        register int rflag = ttyflg;
 
@@ -104,8 +99,7 @@ STRING v[];
        done();
 }
 
-static void exfile(prof)
-BOOL prof;
+static void exfile(BOOL prof)
 {
        register L_INT mailtime = 0;
        register int userid;
@@ -115,22 +109,19 @@ BOOL prof;
        if (input > 0) {
                Ldup(input, INIO);
                input = INIO;
-               ;
        }
 
        /* move output to safe place */
        if (output == 2) {
                Ldup(dup(2), OTIO);
                output = OTIO;
-               ;
        }
 
        userid = getuid();
 
        /* decide whether interactive */
        if ((flags & intflg)
-           || ((flags & oneflg) == 0 && isatty(output) && isatty(input))
-           ) {
+           || ((flags & oneflg) == 0 && isatty(output) && isatty(input))) {
                dfault(&ps1nod, (userid ? stdprompt : supprompt));
                dfault(&ps2nod, readmsg);
                flags |= ttyflg | prompt;
@@ -138,21 +129,18 @@ BOOL prof;
        } else {
                flags |= prof;
                flags &= ~prompt;
-               ;
        }
 
        if (setjmp(errshell) && prof) {
                close(input);
                return;
-               ;
        }
 
        /* error return here */
        loopcnt = breakcnt = peekc = 0;
        iopend = 0;
-       if (input >= 0) {
+       if (input >= 0)
                initf(input);
-       }
 
        /* command loop */
        for (;;) {
@@ -171,15 +159,12 @@ BOOL prof;
                        prs(ps1nod.namval);
                        alarm(TIMEOUT);
                        flags |= waiting;
-                       ;
                }
 
                trapnote = 0;
                peekc = readc();
-               if (eof) {
+               if (eof)
                        return;
-                       ;
-               }
                alarm(0);
                flags &= ~waiting;
                execute(cmd(NL, MTFLG), 0);
@@ -187,24 +172,20 @@ BOOL prof;
        }
 }
 
-chkpr(eor)
-char eor;
+void chkpr(char eor)
 {
-       if ((flags & prompt) && standin->fstak == 0 && eor == NL) {
+       if ((flags & prompt) && standin->fstak == 0 && eor == NL)
                prs(ps2nod.namval);
-               ;
-       }
 }
 
-settmp()
+void settmp(void)
 {
        itos(getpid());
        serial = 0;
        tmpnam = movstr(numbuf, &tmpout[TMPNAM]);
 }
 
-Ldup(fa, fb)
-register int fa, fb;
+void Ldup(register int fa, register int fb)
 {
        dup2(fa, fb);
        close(fa);