From: Nick Downing <downing.nick@gmail.com>
Date: Mon, 23 Jan 2017 15:13:58 +0000 (+1100)
Subject: Ansified bin/tp
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e7e6b61faa860103a23be5e22a8a3da1feef88b3;p=43bsd.git

Ansified bin/tp
---

diff --git a/bin/tp/tp.h b/bin/tp/tp.h
index 093908f..3b59508 100644
--- a/bin/tp/tp.h
+++ b/bin/tp/tp.h
@@ -1,3 +1,6 @@
+#ifndef _TP_H_
+#define _TP_H_
+
 /*	@(#)tp.h	4.2	6/28/84	*/
 
 /*	c-version of tp?.s
@@ -68,9 +71,9 @@ extern int	fio;
 extern short	ndirent, ndentb;
 extern struct	dent *edir;
 extern struct	dent *lastd;		/* for improvement */
-char *sbrk();
-char *strcpy();
-long lseek();
+/*char *sbrk();*/
+/*char *strcpy();*/
+/*long lseek();*/
 int (*command)();
 
 extern	int	flags;
@@ -81,3 +84,57 @@ extern	int	flags;
 #define	flv	0040
 #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));
+
+/* 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));
+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));
+
+/* 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));
+
+#endif
diff --git a/bin/tp/tp0.c b/bin/tp/tp0.c
index 9c6aefc..cb21856 100644
--- a/bin/tp/tp0.c
+++ b/bin/tp/tp0.c
@@ -1,8 +1,10 @@
+#include "tp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)tp0.c	4.1 12/18/82";
 #endif
 
-#include "tp.h"
+/*#include "tp.h"*/
 
 int	flags	= flu;
 char	mt[]	= "/dev/rmt0";
diff --git a/bin/tp/tp1.c b/bin/tp/tp1.c
index 7dd682b..2488a24 100644
--- a/bin/tp/tp1.c
+++ b/bin/tp/tp1.c
@@ -1,12 +1,16 @@
+#include <gen.h>
+#include <stdio.h>
+/*#include <strings.h> gen.h*/
+#include <sys/file.h>
+#include "tp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)tp1.c	4.2 6/28/84";
 #endif
 
-#include "tp.h"
+/*#include "tp.h"*/
 
-main(argc,argv)
-char **argv;
-{
+int main(argc, argv) int argc; char **argv; {
 	register char c,*ptr;
 	extern cmd(), cmr(),cmx(), cmt();
 
@@ -66,8 +70,7 @@ char **argv;
 	(*command)();
 }
 
-optap()
-{
+int optap() {
 	extern cmr();
 
 	if ((flags & flm) == 0) {	/*  DECTAPE */
@@ -91,25 +94,21 @@ optap()
 	edir = &dir[ndirent];
 }
 
-setcom(newcom)
-int (*newcom)();
-{
+int setcom(newcom) int (*newcom)(); {
 	extern cmr();
 
 	if (command != cmr)  	useerr();
 	command = newcom;
 }
 
-useerr()
-{
+int useerr() {
 	printf("Bad usage\n");
 	done();
 }
 
 /*/* COMMANDS */
 
-cmd()
-{
+int cmd() {
 	extern delete();
 
 	if (flags & (flm|flc))	useerr();
@@ -120,8 +119,7 @@ cmd()
 	check();
 }
 
-cmr()
-{
+int cmr() {
 	if (flags & (flc|flm))		clrdir();
 	else				rddir();
 	getfiles();
@@ -129,8 +127,7 @@ cmr()
 	check();
 }
 
-cmt()
-{
+int cmt() {
 	extern taboc();
 
 	if (flags & (flc|flw))	useerr();
@@ -141,8 +138,7 @@ cmt()
 	check();
 }
 
-cmx()
-{
+int cmx() {
 	extern extract();
 
 	if (flags & (flc))		useerr();
@@ -151,23 +147,18 @@ cmx()
 	done();
 }
 
-check()
-{
+int check() {
 	usage();
 	done();
 }
 
-done()
-{
+int done() {
 	printf("End\n");
 	exit(0);
 }
 
-encode(pname,dptr)	/* pname points to the pathname
-			 * dptr points to the dir entry		   */
-char	*pname;
-struct	dent *dptr;
-{
+int 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();
@@ -186,11 +177,8 @@ struct	dent *dptr;
 	}
 }
 
-decode(pname,dptr)	/* dptr points to the dir entry
-			 * name is placed in pname[] */
-char	*pname;
-struct	dent *dptr;
-{
+int 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 bbdca17..a6beeb2 100644
--- a/bin/tp/tp2.c
+++ b/bin/tp/tp2.c
@@ -1,17 +1,24 @@
+#include <gen.h>
+#include <stdio.h>
+/*#include <strings.h> gen.h*/
+/*#include <sys/dir.h> gen.h*/
+#include <sys/file.h>
+#include <sys/stat.h>
+#include "tp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)tp2.c	4.1 12/18/82";
 #endif
 
-#include "tp.h"
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/dir.h>
+/*#include "tp.h"*/
+/*#include <stdio.h>*/
+/*#include <sys/param.h>*/
+/*#include <sys/stat.h>*/
+/*#include <sys/dir.h>*/
 
 struct stat	statb;
 
-clrdir()
-{
+int clrdir() {
 	register j, *p;
 
 	j = ndirent * (DIRSZ/sizeof(int));
@@ -20,9 +27,7 @@ clrdir()
 	lastd = 0;
 }
 
-clrent(ptr)
-struct	dent *ptr;
-{
+int clrent(ptr) struct dent *ptr; {
 	register *p, j;
 
 	p  = (int *)ptr;
@@ -37,9 +42,7 @@ struct	dent *ptr;
 	} while (lastd->d_namep == 0);
 }
 
-
-rddir()
-{
+int rddir() {
 	register struct tent *tp;
 	register struct dent *p1;
 	struct dent  *dptr;
@@ -105,9 +108,7 @@ rddir()
 	bitmap();
 }
 
-
-wrdir()
-{
+int wrdir() {
 	register struct tent *tp;
 	register struct dent *dp;
 	struct dent *dptr;
@@ -165,8 +166,7 @@ wrdir()
 	}
 }
 
-tread()
-{
+int tread() {
 	register j, *ptr;
 
 	if (read(fio,(char *)tapeb,BSIZE) != BSIZE) {
@@ -179,8 +179,7 @@ tread()
 	rseeka++;
 }
 
-twrite()
-{
+int twrite() {
 	if (write(fio, (char *)tapeb,BSIZE) != BSIZE) {
 		printf("Tape write error\n");
 		done();
@@ -188,14 +187,12 @@ twrite()
 	++wseeka;
 }
 
-rseek(blk)
-{
+int rseek(blk) int blk; {
 	rseeka = blk;
 	if (lseek(fio,(long)blk*BSIZE,0) < 0)	seekerr();
 }
 
-wseek(blk)
-{
+int wseek(blk) int blk; {
 	register amt, b;
 
 	amt = b = blk;
@@ -208,14 +205,12 @@ wseek(blk)
 	if (lseek(fio, (long)b*BSIZE, 0) < 0)	seekerr();
 }
 
-seekerr()
-{
+int seekerr() {
 	printf("Tape seek error\n");
 	done();
 }
 
-verify(key)
-{
+int verify(key) int key; {
 	register c;
 
 	if ((flags & (flw | flv)) == 0)
@@ -236,8 +231,7 @@ repeat:	printf("%c %s ", key, name);
 	goto repeat;
 }
 
-getfiles()
-{
+int getfiles() {
 
 	if ((narg -= 2) == 0) {
 		strcpy(name, ".");
@@ -248,9 +242,7 @@ getfiles()
 	}
 }
 
-
-expand()
-{
+int expand() {
 	register  char *p0, *save0;
 	int n;
 	register DIR *dirp;
@@ -278,14 +270,12 @@ expand()
 	}
 }
 
-fserr()
-{
+int fserr() {
 	printf("%s -- Cannot open file\n", name);
 	done();
 }
 
-callout()
-{
+int callout() {
 	register struct dent *d;
 	register char *ptr1, *ptr0;
 	struct dent *empty;
@@ -343,9 +333,7 @@ copydir:
 	;
 }
 
-swabdir(tp)
-register struct tent *tp;
-{
+int 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 5c9731d..414102a 100644
--- a/bin/tp/tp3.c
+++ b/bin/tp/tp3.c
@@ -1,12 +1,15 @@
+#include <stdio.h>
+#include <sys/file.h>
+#include <time.h>
+#include "tp.h"
+
 #ifndef lint
 static char sccsid[] = "@(#)tp3.c	4.1 12/18/82";
 #endif
 
-#include "tp.h"
+/*#include "tp.h"*/
 
-gettape(how)
-int (*how)();
-{
+int gettape(how) int (*how)(); {
 	register char *ptr0, *ptr1;
 	register struct dent *d;
 	int count;
@@ -34,21 +37,16 @@ cont:			continue;
 	} while (--narg > 2);
 }
 
-delete(dd)
-struct dent *dd;
-{
+int delete(dd) struct dent *dd; {
 	if (verify('d') >= 0)
 		clrent(dd);
 }
 
-
-update()
-{
+int update() {
 	register struct dent *d;
 	register b, last;
 	int first, size;
 
-
 	bitmap();
 	d = &dir[0];
 	do {
@@ -71,9 +69,7 @@ toosmall:	++first;
 	update1();
 }
 
-
-update1()
-{
+int update1() {
 	register struct dent *d, *id;
 	register index;
 	int f;
@@ -111,12 +107,9 @@ update1()
 	}
 }
 
-phserr()
-{	printf("%s -- Phase error \n", name);  }
-
+int phserr() {	printf("%s -- Phase error \n", name);  }
 
-bitmap()	/* place old files in the map */
-{
+int bitmap() /* place old files in the map */ {
 	register char *m;
 	register count;
 	register struct dent *d;
@@ -131,9 +124,7 @@ bitmap()	/* place old files in the map */
 	}  while (--count);
 }
 
-setmap(d)
-register struct dent *d;
-{
+int setmap(d) register struct dent *d; {
 	unsigned c, block;
 	char bit;
 	int i;
@@ -150,15 +141,12 @@ register struct dent *d;
 	} while (++block < c);
 }
 
-maperr()
-{
+int maperr() {
 	printf("Tape overflow\n");
 	done();
 }
 
-
-usage()
-{
+int usage() {
 	register reg,count;
 	int	nused, nentr, nfree;
 	static lused;
@@ -190,10 +178,7 @@ usage()
 	printf("%4d last\n", lused);
 }
 
-
-taboc(dd)
-struct dent *dd;
-{
+int taboc(dd) struct dent *dd; {
 	register  mode;
 	register *m;
 	register char *s;
@@ -222,10 +207,7 @@ struct dent *dd;
 	printf("%s\n", name);
 }
 
-
-extract(d)
-register struct dent *d;
-{
+int extract(d) register struct dent *d; {
 	register count, id;
 
 	if (d->d_size==0)	return;