Post ansification changes for bin/tp, program can run and print some messages

diff --git a/.gitignore b/.gitignore
index b033ef0..f9e6d4c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 *.usedby
 *.uses
 .xify
+bin/tp
 cproto-4.6/Makefile
 cproto-4.6/config.cache
 cproto-4.6/config.h

diff --git a/bin/tp/tp.h b/bin/tp/tp.h
index 3b59508..60e21b0 100644 (file)
--- a/bin/tp/tp.h
+++ b/bin/tp/tp.h
@@ -74,7 +74,16 @@ extern struct        dent *lastd;            /* for improvement */
 /*char *sbrk();*/
 /*char *strcpy();*/
 /*long lseek();*/
-int (*command)();
+
+#ifndef __P
+#ifdef __STDC__
+#define __P(args) args
+#else
+#define __P(args) ()
+#endif
+#endif
+
+extern void (*command) __P((void));
 
 extern int     flags;
 #define        flc     0001
@@ -85,56 +94,48 @@ extern      int     flags;
 #define        flw     0100
 #define fls    0200
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif
-#endif
-
 /* tp1.c */
-int main __P((int argc, char **argv));
-int optap __P((void));
-int setcom __P((int (*newcom)(void)));
-int useerr __P((void));
-int cmd __P((void));
-int cmr __P((void));
-int cmt __P((void));
-int cmx __P((void));
-int check __P((void));
-int done __P((void));
-int encode __P((char *pname, struct dent *dptr));
-int decode __P((char *pname, struct dent *dptr));
+void main __P((int argc, char **argv));
+void optap __P((void));
+void setcom __P((void (*newcom)(void)));
+void useerr __P((void));
+void cmd __P((void));
+void cmr __P((void));
+void cmt __P((void));
+void cmx __P((void));
+void check __P((void));
+void done __P((void));
+void encode __P((char *pname, struct dent *dptr));
+void decode __P((char *pname, struct dent *dptr));
 
 /* tp2.c */
-int clrdir __P((void));
-int clrent __P((struct dent *ptr));
-int rddir __P((void));
-int wrdir __P((void));
-int tread __P((void));
-int twrite __P((void));
-int rseek __P((int blk));
-int wseek __P((int blk));
-int seekerr __P((void));
+void clrdir __P((void));
+void clrent __P((struct dent *ptr));
+void rddir __P((void));
+void wrdir __P((void));
+void tread __P((void));
+void twrite __P((void));
+void rseek __P((int blk));
+void wseek __P((int blk));
+void seekerr __P((void));
 int verify __P((int key));
-int getfiles __P((void));
-int expand __P((void));
-int fserr __P((void));
-int callout __P((void));
-int swabdir __P((register struct tent *tp));
+void getfiles __P((void));
+void expand __P((void));
+void fserr __P((void));
+void callout __P((void));
+void swabdir __P((register struct tent *tp));
 
 /* tp3.c */
-int gettape __P((int (*how)(void)));
-int delete __P((struct dent *dd));
-int update __P((void));
-int update1 __P((void));
-int phserr __P((void));
-int bitmap __P((void));
-int setmap __P((register struct dent *d));
-int maperr __P((void));
-int usage __P((void));
-int taboc __P((struct dent *dd));
-int extract __P((register struct dent *d));
+void gettape __P((void (*how)(register struct dent *d)));
+void delete __P((struct dent *dd));
+void update __P((void));
+void update1 __P((void));
+void phserr __P((void));
+void bitmap __P((void));
+void setmap __P((register struct dent *d));
+void maperr __P((void));
+void usage __P((void));
+void taboc __P((struct dent *dd));
+void extract __P((register struct dent *d));
 
 #endif

diff --git a/bin/tp/tp0.c b/bin/tp/tp0.c
index cb21856..80cdbaf 100644 (file)
--- a/bin/tp/tp0.c
+++ b/bin/tp/tp0.c
@@ -1,6 +1,6 @@
 #include "tp.h"
 
-#ifndef lint
+#if defined(DOSCCS) && !defined(lint)
 static char sccsid[] = "@(#)tp0.c      4.1 12/18/82";
 #endif
 
@@ -25,3 +25,5 @@ int   fio;
 short  ndirent, ndentb;
 struct dent *edir;
 struct dent *lastd;            /* for improvement */
+
+void (*command) __P((void));

diff --git a/bin/tp/tp1.c b/bin/tp/tp1.c
index 2488a24..159842f 100644 (file)
--- a/bin/tp/tp1.c
+++ b/bin/tp/tp1.c
@@ -4,15 +4,15 @@
 #include <sys/file.h>
 #include "tp.h"
 
-#ifndef lint
+#if defined(DOSCCS) && !defined(lint)
 static char sccsid[] = "@(#)tp1.c      4.2 6/28/84";
 #endif
 
 /*#include "tp.h"*/
 
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
        register char c,*ptr;
-       extern cmd(), cmr(),cmx(), cmt();
+       /*extern cmd(), cmr(),cmx(), cmt();*/
 
        tname = tc;
        command = cmr;
@@ -70,8 +70,8 @@ int main(argc, argv) int argc; char **argv; {
        (*command)();
 }
 
-int optap() {
-       extern cmr();
+void optap() {
+       /*extern cmr();*/
 
        if ((flags & flm) == 0) {       /*  DECTAPE */
                tapsiz = TCSIZ;
@@ -94,22 +94,22 @@ int optap() {
        edir = &dir[ndirent];
 }
 
-int setcom(newcom) int (*newcom)(); {
-       extern cmr();
+void setcom(newcom) void (*newcom)(); {
+       /*extern cmr();*/
 
        if (command != cmr)     useerr();
        command = newcom;
 }
 
-int useerr() {
+void useerr() {
        printf("Bad usage\n");
        done();
 }
 
-/*\f/* COMMANDS */
+/* COMMANDS */
 
-int cmd() {
-       extern delete();
+void cmd() {
+       /*extern delete();*/
 
        if (flags & (flm|flc))  useerr();
        if (narg <= 2)                  useerr();
@@ -119,7 +119,7 @@ int cmd() {
        check();
 }
 
-int cmr() {
+void cmr() {
        if (flags & (flc|flm))          clrdir();
        else                            rddir();
        getfiles();
@@ -127,8 +127,8 @@ int cmr() {
        check();
 }
 
-int cmt() {
-       extern taboc();
+void cmt() {
+       /*extern taboc();*/
 
        if (flags & (flc|flw))  useerr();
        rddir();
@@ -138,8 +138,8 @@ int cmt() {
        check();
 }
 
-int cmx() {
-       extern extract();
+void cmx() {
+       /*extern extract();*/
 
        if (flags & (flc))              useerr();
        rddir();
@@ -147,21 +147,21 @@ int cmx() {
        done();
 }
 
-int check() {
+void check() {
        usage();
        done();
 }
 
-int done() {
+void done() {
        printf("End\n");
        exit(0);
 }
 
-int encode(pname, dptr)        /* pname points to the pathname
+void encode(pname, dptr)       /* pname points to the pathname
                         * dptr points to the dir entry            */ char *pname; struct dent *dptr; {
        register  char *np;
        register n;
-       extern char *malloc();
+       /*extern char *malloc();*/
 
        if((n=strlen(pname)) > NAMELEN) {
                printf("Pathname too long - %s\nFile ignored\n",pname);
@@ -177,7 +177,7 @@ int encode(pname, dptr)     /* pname points to the pathname
        }
 }
 
-int decode(pname, dptr)        /* dptr points to the dir entry
+void decode(pname, dptr)       /* dptr points to the dir entry
                         * name is placed in pname[] */ char *pname; struct dent *dptr; {
 
        strcpy(pname, dptr->d_namep);

diff --git a/bin/tp/tp2.c b/bin/tp/tp2.c
index a6beeb2..430e72c 100644 (file)
--- a/bin/tp/tp2.c
+++ b/bin/tp/tp2.c
@@ -6,7 +6,7 @@
 #include <sys/stat.h>
 #include "tp.h"
 
-#ifndef lint
+#if defined(DOSCCS) && !defined(lint)
 static char sccsid[] = "@(#)tp2.c      4.1 12/18/82";
 #endif
 
@@ -18,7 +18,7 @@ static char sccsid[] = "@(#)tp2.c     4.1 12/18/82";
 
 struct stat    statb;
 
-int clrdir() {
+void clrdir() {
        register j, *p;
 
        j = ndirent * (DIRSZ/sizeof(int));
@@ -27,7 +27,7 @@ int clrdir() {
        lastd = 0;
 }
 
-int clrent(ptr) struct dent *ptr; {
+void clrent(ptr) struct dent *ptr; {
        register *p, j;
 
        p  = (int *)ptr;
@@ -42,7 +42,7 @@ int clrent(ptr) struct dent *ptr; {
        } while (lastd->d_namep == 0);
 }
 
-int rddir() {
+void rddir() {
        register struct tent *tp;
        register struct dent *p1;
        struct dent  *dptr;
@@ -108,7 +108,7 @@ int rddir() {
        bitmap();
 }
 
-int wrdir() {
+void wrdir() {
        register struct tent *tp;
        register struct dent *dp;
        struct dent *dptr;
@@ -166,7 +166,7 @@ int wrdir() {
        }
 }
 
-int tread() {
+void tread() {
        register j, *ptr;
 
        if (read(fio,(char *)tapeb,BSIZE) != BSIZE) {
@@ -179,7 +179,7 @@ int tread() {
        rseeka++;
 }
 
-int twrite() {
+void twrite() {
        if (write(fio, (char *)tapeb,BSIZE) != BSIZE) {
                printf("Tape write error\n");
                done();
@@ -187,12 +187,12 @@ int twrite() {
        ++wseeka;
 }
 
-int rseek(blk) int blk; {
+void rseek(blk) int blk; {
        rseeka = blk;
        if (lseek(fio,(long)blk*BSIZE,0) < 0)   seekerr();
 }
 
-int wseek(blk) int blk; {
+void wseek(blk) int blk; {
        register amt, b;
 
        amt = b = blk;
@@ -205,7 +205,7 @@ int wseek(blk) int blk; {
        if (lseek(fio, (long)b*BSIZE, 0) < 0)   seekerr();
 }
 
-int seekerr() {
+void seekerr() {
        printf("Tape seek error\n");
        done();
 }
@@ -231,7 +231,7 @@ repeat:     printf("%c %s ", key, name);
        goto repeat;
 }
 
-int getfiles() {
+void getfiles() {
 
        if ((narg -= 2) == 0) {
                strcpy(name, ".");
@@ -242,9 +242,8 @@ int getfiles() {
        }
 }
 
-int expand() {
+void expand() {
        register  char *p0, *save0;
-       int n;
        register DIR *dirp;
        struct direct *dirent;
 
@@ -270,12 +269,12 @@ int expand() {
        }
 }
 
-int fserr() {
+void fserr() {
        printf("%s -- Cannot open file\n", name);
        done();
 }
 
-int callout() {
+void callout() {
        register struct dent *d;
        register char *ptr1, *ptr0;
        struct dent *empty;
@@ -333,7 +332,7 @@ copydir:
        ;
 }
 
-int swabdir(tp) register struct tent *tp; {
+void swabdir(tp) register struct tent *tp; {
        swab((char *)tp, (char *)tp, sizeof(*tp));
        swab(tp->pathnam, tp->pathnam, NAMELEN);
        swab((char *)&tp->uid, (char *)&tp->uid, 4); /* uid,gid,spare,size0 */

diff --git a/bin/tp/tp3.c b/bin/tp/tp3.c
index 414102a..4f71a4e 100644 (file)
--- a/bin/tp/tp3.c
+++ b/bin/tp/tp3.c
@@ -3,13 +3,13 @@
 #include <time.h>
 #include "tp.h"
 
-#ifndef lint
+#if defined(DOSCCS) && !defined(lint)
 static char sccsid[] = "@(#)tp3.c      4.1 12/18/82";
 #endif
 
 /*#include "tp.h"*/
 
-int gettape(how) int (*how)(); {
+void gettape(how) void (*how) __P((register struct dent *d)); {
        register char *ptr0, *ptr1;
        register struct dent *d;
        int count;
@@ -37,12 +37,12 @@ cont:                       continue;
        } while (--narg > 2);
 }
 
-int delete(dd) struct dent *dd; {
+void delete(dd) struct dent *dd; {
        if (verify('d') >= 0)
                clrent(dd);
 }
 
-int update() {
+void update() {
        register struct dent *d;
        register b, last;
        int first, size;
@@ -69,7 +69,7 @@ toosmall:     ++first;
        update1();
 }
 
-int update1() {
+void update1() {
        register struct dent *d, *id;
        register index;
        int f;
@@ -107,9 +107,9 @@ int update1() {
        }
 }
 
-int phserr() { printf("%s -- Phase error \n", name);  }
+void phserr() {        printf("%s -- Phase error \n", name);  }
 
-int bitmap() /* place old files in the map */ {
+void bitmap() /* place old files in the map */ {
        register char *m;
        register count;
        register struct dent *d;
@@ -124,7 +124,7 @@ int bitmap() /* place old files in the map */ {
        }  while (--count);
 }
 
-int setmap(d) register struct dent *d; {
+void setmap(d) register struct dent *d; {
        unsigned c, block;
        char bit;
        int i;
@@ -141,12 +141,12 @@ int setmap(d) register struct dent *d; {
        } while (++block < c);
 }
 
-int maperr() {
+void maperr() {
        printf("Tape overflow\n");
        done();
 }
 
-int usage() {
+void usage() {
        register reg,count;
        int     nused, nentr, nfree;
        static lused;
@@ -178,11 +178,11 @@ int usage() {
        printf("%4d last\n", lused);
 }
 
-int taboc(dd) struct dent *dd; {
+void taboc(dd) struct dent *dd; {
        register  mode;
-       register *m;
+       register struct tm *m;
        register char *s;
-       int count, *localtime();
+       int count/*, *localtime()*/;
        char work[20];
 
        if (flags & flv)  {
@@ -202,12 +202,12 @@ int taboc(dd) struct dent *dd; {
                if (mode&2)             s[5] = 's';
                printf("%s%4d%4d%5d%9D ",s,dd->d_uid, dd->d_gid,dd->d_tapea,dd->d_size);
                m = localtime(&dd->d_time);
-               printf("%2d/%2d/%2d %2d:%2d ",m[5],m[4]+1,m[3],m[2],m[1]);
+               printf("%2d/%2d/%2d %2d:%2d ",m->tm_year,m->tm_mon,m->tm_mday+1,m->tm_hour,m->tm_min);
        }
        printf("%s\n", name);
 }
 
-int extract(d) register struct dent *d; {
+void extract(d) register struct dent *d; {
        register count, id;
 
        if (d->d_size==0)       return;

diff --git a/scripts/errfunc.sh b/scripts/errfunc.sh
index 3186da7..2908e09 100755 (executable)
--- a/scripts/errfunc.sh
+++ b/scripts/errfunc.sh
@@ -2,7 +2,7 @@
 prefix=
 while read i
 do
-  func=`echo $i |sed -ne 's/.*: In function ‘\(.*\)’:$/\1/p'`
+  func=`echo $i |sed -ne 's/.*: In function ‘x_\(.*\)’:$/\1/p'`
   if test -n "$func"
   then
     prefix="$func: "

diff --git a/scripts/nonvoid.sh b/scripts/nonvoid.sh
index 4a3877a..6b08cf9 100755 (executable)
--- a/scripts/nonvoid.sh
+++ b/scripts/nonvoid.sh
@@ -1,2 +1,3 @@
 #!/bin/sh
-./errfunc.sh |grep "control reaches end of non-void function\|‘return’ with no value, in function returning non-void" |sed -e 's/:.*//' |sort |uniq |sed -e 's/.*/s\/^int &\\((\\| __P((\\)\/void &\\1\//'
+ROOT=`dirname $0`/..
+$ROOT/scripts/errfunc.sh |grep "control reaches end of non-void function\|‘return’ with no value, in function returning non-void" |sed -e 's/:.*//' |sort |uniq |sed -e 's/.*/s\/^int &\\((\\| __P((\\)\/void &\\1\//'

diff --git a/xify/cc.c b/xify/cc.c
index e02bad5..82b4f2d 100644 (file)
--- a/xify/cc.c
+++ b/xify/cc.c
@@ -131,7 +131,7 @@ int main(argc, argv) int argc; char **argv; {
 #endif
 
        /* ld currently adds upto 5 args; 10 is room to spare */
-       av = (char **)calloc(argc+10, sizeof (char **));
+       av = (char **)calloc(argc+/*10*/20, sizeof (char **));
        clist = (char **)calloc(argc, sizeof (char **));
        llist = (char **)calloc(argc, sizeof (char **));
        plist = (char **)calloc(argc, sizeof (char **));
@@ -374,8 +374,14 @@ int main(argc, argv) int argc; char **argv; {
                        av[na++] = "-pg";
                if (gflag || Gflag)
                        av[na++] = "-g";
-               if (wflag)
+               if (!wflag) {
                        av[na++] = "-Wall";
+                       av[na++] = "-Wno-char-subscripts";
+                       av[na++] = "-Wno-deprecated-declarations";
+                       av[na++] = "-Wno-maybe-uninitialized";
+                       av[na++] = "-Wno-parentheses";
+                       av[na++] = "-Wno-unused-result";
+               }
                if (oflag)
                        av[na++] = "-O3";
                if (exflag)