dtksh: remove register keyword

This commit is contained in:
Jon Trulson
2018-06-27 17:18:06 -06:00
parent 556ce45298
commit 97264ba971
296 changed files with 2503 additions and 2503 deletions
@@ -94,9 +94,9 @@ static const char id[] = "\n@(#)basename (AT&T Bell Laboratories) 03/01/94\0\n";
#include <cmdlib.h>
static void namebase __PARAM__((Sfio_t *outfile, register char *pathname, char *suffix), (outfile, pathname, suffix)) __OTORP__(Sfio_t *outfile; register char *pathname; char *suffix;){
register char *first, *last;
register int n=0;
static void namebase __PARAM__((Sfio_t *outfile, char *pathname, char *suffix), (outfile, pathname, suffix)) __OTORP__(Sfio_t *outfile; char *pathname; char *suffix;){
char *first, *last;
int n=0;
for(first=last=pathname; *last; last++);
/* back over trailing '/' */
if(last>first)
@@ -126,8 +126,8 @@ static void namebase __PARAM__((Sfio_t *outfile, register char *pathname, char *
}
int
b_basename __PARAM__((int argc,register char *argv[]), (argc, argv)) __OTORP__(int argc;register char *argv[];){
register int n;
b_basename __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
int n;
NoP(id[0]);
cmdinit(argv);
@@ -123,11 +123,11 @@ static char states[UCHAR_MAX+1];
static int
vcat __PARAM__((Sfio_t *fdin, Sfio_t *fdout, int flags), (fdin, fdout, flags)) __OTORP__(Sfio_t *fdin; Sfio_t *fdout; int flags;){
register unsigned char* cp;
register unsigned char* cpold;
register int n;
register int line = 1;
register unsigned char* endbuff;
unsigned char* cp;
unsigned char* cpold;
int n;
int line = 1;
unsigned char* endbuff;
unsigned char* inbuff;
int printdefer = (flags&(B_FLAG|N_FLAG));
int lastchar;
@@ -240,10 +240,10 @@ vcat __PARAM__((Sfio_t *fdin, Sfio_t *fdout, int flags), (fdin, fdout, flags)) _
int
b_cat __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register int n;
register int flags = 0;
register char* cp;
register Sfio_t* fp;
int n;
int flags = 0;
char* cp;
Sfio_t* fp;
int att;
NoP(id[0]);
@@ -135,9 +135,9 @@ extern __MANGLE__ int lchown __PROTO__((const char*, uid_t, gid_t));
*/
static void
getids __PARAM__((register char* s, char** e, int* uid, int* gid, int flags), (s, e, uid, gid, flags)) __OTORP__(register char* s; char** e; int* uid; int* gid; int flags;){
register char* t;
register int n;
getids __PARAM__((char* s, char** e, int* uid, int* gid, int flags), (s, e, uid, gid, flags)) __OTORP__(char* s; char** e; int* uid; int* gid; int flags;){
char* t;
int n;
char* z;
char buf[64];
@@ -185,10 +185,10 @@ getids __PARAM__((register char* s, char** e, int* uid, int* gid, int flags), (s
int
b_chgrp __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int flags = 0;
register char* file;
register char* s;
register Map_t* m;
int flags = 0;
char* file;
char* s;
Map_t* m;
Hash_table_t* map = 0;
int resolve;
int n;
@@ -114,12 +114,12 @@ extern __MANGLE__ int lchmod __PROTO__((const char*, mode_t));
int
b_chmod __PARAM__((int argc, char* argv[]), (argc, argv)) __OTORP__(int argc; char* argv[];){
register int mode;
register int force = 0;
register int recurse = 0;
register int resolve;
register char* amode;
register char* file;
int mode;
int force = 0;
int recurse = 0;
int resolve;
char* amode;
char* file;
char* last;
struct stat st;
int (*chmodf) __PROTO__((const char*, mode_t));
@@ -111,8 +111,8 @@
*/
static void
cmdinit __PARAM__((register char** argv), (argv)) __OTORP__(register char** argv;){
register char* cp;
cmdinit __PARAM__((char** argv), (argv)) __OTORP__(char** argv;){
char* cp;
if (cp = strrchr(argv[0], '/')) cp++;
else cp = argv[0];
@@ -93,8 +93,8 @@
#include <cmdlib.h>
void
cmdinit __PARAM__((register char** argv), (argv)) __OTORP__(register char** argv;){
register char* cp;
cmdinit __PARAM__((char** argv), (argv)) __OTORP__(char** argv;){
char* cp;
if (cp = strrchr(argv[0], '/')) cp++;
else cp = argv[0];
@@ -96,8 +96,8 @@
int
cmdrecurse __PARAM__((int argc, char** argv, int pfxc, char** pfxv), (argc, argv, pfxc, pfxv)) __OTORP__(int argc; char** argv; int pfxc; char** pfxv;){
register char** v;
register char** a;
char** v;
char** a;
int resolve = 'L';
char arg[16];
@@ -104,13 +104,13 @@ static const char id[] = "\n@(#)cmp (AT&T Bell Laboratories) 07/17/94\0\n";
static int
cmp __PARAM__((const char* file1, Sfio_t* f1, const char* file2, Sfio_t* f2, int flags), (file1, f1, file2, f2, flags)) __OTORP__(const char* file1; Sfio_t* f1; const char* file2; Sfio_t* f2; int flags;){
register int c1;
register int c2;
register unsigned char* p1 = 0;
register unsigned char* p2 = 0;
register int lines = 1;
register unsigned char* e1 = 0;
register unsigned char* e2 = 0;
int c1;
int c2;
unsigned char* p1 = 0;
unsigned char* p2 = 0;
int lines = 1;
unsigned char* e1 = 0;
unsigned char* e2 = 0;
unsigned long pos = 0;
int ret = 0;
unsigned char* last;
@@ -177,7 +177,7 @@ cmp __PARAM__((const char* file1, Sfio_t* f1, const char* file2, Sfio_t* f2, int
}
int
b_cmp __PARAM__((int argc, register char** argv), (argc, argv)) __OTORP__(int argc; register char** argv;){
b_cmp __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
char* s;
char* e;
Sfio_t* f1 = 0;
@@ -99,9 +99,9 @@ static const char id[] = "\n@(#)comm (AT&T Bell Laboratories) 04/01/92\0\n";
#define C_COMMON 4
#define C_ALL (C_FILE1|C_FILE2|C_COMMON)
static int comm __PARAM__((Sfio_t *in1, Sfio_t *in2, register Sfio_t *out,register int mode), (in1, in2, out, mode)) __OTORP__(Sfio_t *in1; Sfio_t *in2; register Sfio_t *out;register int mode;){
register char *cp1, *cp2;
register int n1, n2, n, comp;
static int comm __PARAM__((Sfio_t *in1, Sfio_t *in2, Sfio_t *out,int mode), (in1, in2, out, mode)) __OTORP__(Sfio_t *in1; Sfio_t *in2; Sfio_t *out;int mode;){
char *cp1, *cp2;
int n1, n2, n, comp;
if(cp1 = sfgetr(in1,'\n',0))
n1 = sfslen();
if(cp2 = sfgetr(in2,'\n',0))
@@ -181,9 +181,9 @@ static int comm __PARAM__((Sfio_t *in1, Sfio_t *in2, register Sfio_t *out,regist
int
b_comm __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int n;
register int mode = C_FILE1|C_FILE2|C_COMMON;
register char *cp;
int n;
int mode = C_FILE1|C_FILE2|C_COMMON;
char *cp;
Sfio_t *f1, *f2;
NoP(id[0]);
+17 -17
View File
@@ -119,14 +119,14 @@ static int seqno;
* compare the first of an array of integers
*/
static int mycomp __PARAM__((register const __V_ *a,register const __V_ *b), (a, b)) __OTORP__(register const __V_ *a;register const __V_ *b;){
static int mycomp __PARAM__((const __V_ *a,const __V_ *b), (a, b)) __OTORP__(const __V_ *a;const __V_ *b;){
return(*((int*)a) - *((int*)b));
}
static Cut_t *cutinit __PARAM__((int mode,char *str,int wdelim,int ldelim), (mode, str, wdelim, ldelim)) __OTORP__(int mode;char *str;int wdelim;int ldelim;){
register int *lp, c, n=0;
register int range = 0;
register char *cp = str;
int *lp, c, n=0;
int range = 0;
char *cp = str;
Cut_t *cuthdr;
cuthdr = (Cut_t*)stakalloc(sizeof(Cut_t)+strlen(cp)*sizeof(int));
cuthdr->cflag = ((mode&C_CHARS)!=0);
@@ -158,7 +158,7 @@ static Cut_t *cutinit __PARAM__((int mode,char *str,int wdelim,int ldelim), (mod
}
if(c==0)
{
register int *dp;
int *dp;
*lp = HUGE;
n = 1 + (lp-cuthdr->list)/2;
qsort(lp=cuthdr->list,n,2*sizeof(*lp),mycomp);
@@ -227,10 +227,10 @@ static Cut_t *cutinit __PARAM__((int mode,char *str,int wdelim,int ldelim), (mod
*/
static int cutcols __PARAM__((const Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout), (cuthdr, fdin, fdout)) __OTORP__(const Cut_t *cuthdr;Sfio_t *fdin;Sfio_t *fdout;){
register int c, ncol=0;
register const int *lp = cuthdr->list;
register char *inp, *inend;
register int skip; /* non-zero for don't copy */
int c, ncol=0;
const int *lp = cuthdr->list;
char *inp, *inend;
int skip; /* non-zero for don't copy */
int inword = 0;
while(inp = sfgetr(fdin,'\n', 0))
{
@@ -267,12 +267,12 @@ static int cutcols __PARAM__((const Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout), (
static int cutfields __PARAM__((const Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout), (cuthdr, fdin, fdout)) __OTORP__(const Cut_t *cuthdr;Sfio_t *fdin;Sfio_t *fdout;){
static signed char space[1<<CHAR_BIT];
static int lastseq, lastwdelim = 0, lastldelim = '\n';
register unsigned char *cp;
register int c, nfields;
register const int *lp = cuthdr->list;
register unsigned char *copy;
register int nodelim, empty, inword=0;
register unsigned char *endbuff;
unsigned char *cp;
int c, nfields;
const int *lp = cuthdr->list;
unsigned char *copy;
int nodelim, empty, inword=0;
unsigned char *endbuff;
unsigned char *inbuff, *first;
int lastchar;
Sfio_t *fdtmp = 0;
@@ -384,8 +384,8 @@ failed:
int
b_cut __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
register char *cp;
register Sfio_t *fp;
char *cp;
Sfio_t *fp;
int n;
Cut_t *cuthdr;
int mode = 0;
@@ -94,8 +94,8 @@ static const char id[] = "\n@(#)dirname (AT&T Bell Laboratories) 07/17/92\0\n";
#include <cmdlib.h>
static void dirname __PARAM__((register Sfio_t *outfile, register const char *pathname), (outfile, pathname)) __OTORP__(register Sfio_t *outfile; register const char *pathname;){
register const char *last;
static void dirname __PARAM__((Sfio_t *outfile, const char *pathname), (outfile, pathname)) __OTORP__(Sfio_t *outfile; const char *pathname;){
const char *last;
/* go to end of path */
for(last=pathname; *last; last++);
/* back over trailing '/' */
@@ -124,8 +124,8 @@ static void dirname __PARAM__((register Sfio_t *outfile, register const char *pa
}
int
b_dirname __PARAM__((int argc,register char *argv[]), (argc, argv)) __OTORP__(int argc;register char *argv[];){
register int n;
b_dirname __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
int n;
NoP(id[0]);
cmdinit(argv);
@@ -106,10 +106,10 @@ static const char id[] = "\n@(#)fold (AT&T Bell Laboratories) 04/01/92\0\n";
static char cols[1<<CHAR_BIT];
static void fold __PARAM__((Sfio_t *in, Sfio_t *out, register int width), (in, out, width)) __OTORP__(Sfio_t *in; Sfio_t *out; register int width;){
register char *cp, *first;
register int n, col=0;
register char *last_space=0;
static void fold __PARAM__((Sfio_t *in, Sfio_t *out, int width), (in, out, width)) __OTORP__(Sfio_t *in; Sfio_t *out; int width;){
char *cp, *first;
int n, col=0;
char *last_space=0;
cols[0] = 0;
while(cp = sfgetr(in,'\n',0))
{
@@ -177,9 +177,9 @@ static void fold __PARAM__((Sfio_t *in, Sfio_t *out, register int width), (in, o
int
b_fold __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int n, width=WIDTH;
register Sfio_t *fp;
register char *cp;
int n, width=WIDTH;
Sfio_t *fp;
char *cp;
NoP(id[0]);
cmdinit(argv);
@@ -96,11 +96,11 @@ static const char id[] = "\n@(#)getconf (AT&T Bell Laboratories) 05/09/95\0\n";
int
b_getconf __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register char* name;
register char* path;
register char* value;
register char* s;
register int n;
char* name;
char* path;
char* value;
char* s;
int n;
int flags;
static char empty[] = "-";
@@ -95,14 +95,14 @@ static const char id[] = "\n@(#)head (AT&T Bell Laboratories) 04/01/92\0\n";
#include <cmdlib.h>
int
b_head __PARAM__((int argc, register char *argv[]), (argc, argv)) __OTORP__(int argc; register char *argv[];){
b_head __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
static char header_fmt[] = "\n==> %s <==\n";
register Sfio_t *fp;
register char *cp;
register long number = 10;
register off_t skip = 0;
register int n;
register int delim = '\n';
Sfio_t *fp;
char *cp;
long number = 10;
off_t skip = 0;
int n;
int delim = '\n';
char *format = header_fmt+1;
NoP(id[0]);
+16 -16
View File
@@ -139,10 +139,10 @@ static const char id[] = "\n@(#)id (AT&T Bell Laboratories) 07/17/94\0\n";
#if _lib_fsid
static void
getfsids __PARAM__((Sfio_t* sp, const char* name, int flags, register int lastchar), (sp, name, flags, lastchar)) __OTORP__(Sfio_t* sp; const char* name; int flags; register int lastchar;){
register struct fsg* fs;
register char* s;
register char** p;
getfsids __PARAM__((Sfio_t* sp, const char* name, int flags, int lastchar), (sp, name, flags, lastchar)) __OTORP__(Sfio_t* sp; const char* name; int flags; int lastchar;){
struct fsg* fs;
char* s;
char** p;
char** x;
if (lastchar)
@@ -161,9 +161,9 @@ getfsids __PARAM__((Sfio_t* sp, const char* name, int flags, register int lastch
if (flags > 0) x = 0;
else
{
register char** q;
register char* t;
register int n;
char** q;
char* t;
int n;
n = 0;
q = p;
@@ -228,14 +228,14 @@ putid __PARAM__((Sfio_t* sp, int flags, const char* label, const char* name, lon
}
static int
getids __PARAM__((Sfio_t* sp, const char* name, register int flags), (sp, name, flags)) __OTORP__(Sfio_t* sp; const char* name; register int flags;){
register struct passwd* pw;
register struct group* grp;
register int i;
register int j;
register int k;
getids __PARAM__((Sfio_t* sp, const char* name, int flags), (sp, name, flags)) __OTORP__(Sfio_t* sp; const char* name; int flags;){
struct passwd* pw;
struct group* grp;
int i;
int j;
int k;
#if _lib_fsid
register struct fsg* fs;
struct fsg* fs;
const char* fs_name;
int fs_id;
#endif
@@ -452,8 +452,8 @@ getids __PARAM__((Sfio_t* sp, const char* name, register int flags), (sp, name,
int
b_id __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int flags = 0;
register int n;
int flags = 0;
int n;
NoP(id[0]);
cmdinit(argv);
+22 -22
View File
@@ -129,7 +129,7 @@ typedef struct
#define S_SPACE 2
#define S_NL 3
static void join_free __PARAM__((register Join_t *jp), (jp)) __OTORP__(register Join_t *jp;){
static void join_free __PARAM__((Join_t *jp), (jp)) __OTORP__(Join_t *jp;){
if(jp->outlist)
free(jp->outlist);
free(jp->file[0].fieldlist);
@@ -137,9 +137,9 @@ static void join_free __PARAM__((register Join_t *jp), (jp)) __OTORP__(register
}
static int getolist __PARAM__((Join_t* jp, const char *first, char** arglist), (jp, first, arglist)) __OTORP__(Join_t* jp; const char *first; char** arglist;){
register const char *cp = first;
const char *cp = first;
char **argv = arglist;
register int c;
int c;
int *outptr, *outmax;
int nfield = NFIELD;
char *str;
@@ -214,11 +214,11 @@ static int getolist __PARAM__((Join_t* jp, const char *first, char** arglist), (
* reads in a record from file <index> and splits into fields
*/
static char *getrec __PARAM__((Join_t* jp, int index), (jp, index)) __OTORP__(Join_t* jp; int index;){
register unsigned char *state = jp->state;
register struct jfile *fp = &jp->file[index];
register char *cp, **ptr = fp->fieldlist;
register int n=0;
register char **ptrmax = ptr + fp->maxfields;
unsigned char *state = jp->state;
struct jfile *fp = &jp->file[index];
char *cp, **ptr = fp->fieldlist;
int n=0;
char **ptrmax = ptr + fp->maxfields;
fp->spaces = 0;
if(!(cp = sfgetr(fp->iop, '\n', 0)))
return(0);
@@ -269,11 +269,11 @@ static char *getrec __PARAM__((Join_t* jp, int index), (jp, index)) __OTORP__(Jo
/*
* print field <n> from file <index>
*/
static int outfield __PARAM__((Join_t* jp, int index, register int n, int last), (jp, index, n, last)) __OTORP__(Join_t* jp; int index; register int n; int last;){
register struct jfile *fp = &jp->file[index];
register char *cp, *cpmax;
register int size;
register Sfio_t *iop = jp->outfile;
static int outfield __PARAM__((Join_t* jp, int index, int n, int last), (jp, index, n, last)) __OTORP__(Join_t* jp; int index; int n; int last;){
struct jfile *fp = &jp->file[index];
char *cp, *cpmax;
int size;
Sfio_t *iop = jp->outfile;
{
if(n < fp->nfields)
{
@@ -315,9 +315,9 @@ static int outfield __PARAM__((Join_t* jp, int index, register int n, int last),
return(0);
}
static int joinout __PARAM__((register Join_t *jp, int mode), (jp, mode)) __OTORP__(register Join_t *jp; int mode;){
register struct jfile *fp;
register int i,j,n;
static int joinout __PARAM__((Join_t *jp, int mode), (jp, mode)) __OTORP__(Join_t *jp; int mode;){
struct jfile *fp;
int i,j,n;
int last,*out;
if(out= jp->outlist)
{
@@ -377,7 +377,7 @@ static int joinout __PARAM__((register Join_t *jp, int mode), (jp, mode)) __OTOR
}
static Join_t *join_init __PARAM__((void), ()){
register Join_t *jp;
Join_t *jp;
static Join_t Join;
jp = &Join;
memzero(jp->state, sizeof(jp->state));
@@ -393,8 +393,8 @@ static Join_t *join_init __PARAM__((void), ()){
}
static int join __PARAM__((Join_t *jp), (jp)) __OTORP__(Join_t *jp;){
register char *cp1, *cp2;
register int n1, n2, n, comp;
char *cp1, *cp2;
int n1, n2, n, comp;
off_t offset = -1;
int ndup=0;
cp1 = getrec(jp,0);
@@ -485,9 +485,9 @@ static int join __PARAM__((Join_t *jp), (jp)) __OTORP__(Join_t *jp;){
int
b_join __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int n;
register char *cp;
register Join_t *jp = join_init();
int n;
char *cp;
Join_t *jp = join_init();
NoP(id[0]);
cmdinit(argv);
@@ -102,8 +102,8 @@ extern __MANGLE__ char* getlogin __PROTO__((void));
int
b_logname __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int n;
register char* logname;
int n;
char* logname;
NoP(argc);
NoP(id[0]);
@@ -99,9 +99,9 @@ static const char id[] = "\n@(#)mkdir (AT&T Bell Laboratories) 02/14/95\0\n";
int
b_mkdir __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register char *arg;
register mode_t mode=DIRMODE, mask;
register int n, mflag=0, pflag=0;
char *arg;
mode_t mode=DIRMODE, mask;
int n, mflag=0, pflag=0;
mode_t dmode;
NoP(argc);
@@ -99,9 +99,9 @@ static const char id[] = "\n@(#)mkfifo (AT&T Bell Laboratories) 04/01/92\0\n";
int
b_mkfifo __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register char *arg;
register mode_t mode=RWALL, mask=0;
register int n, mflag=0;
char *arg;
mode_t mode=RWALL, mask=0;
int n, mflag=0;
NoP(argc);
NoP(id[0]);
+13 -13
View File
@@ -99,10 +99,10 @@ static const char id[] = "\n@(#)paste (AT&T Bell Laboratories) 04/01/92\0\n";
* to <out>
*/
static int paste __PARAM__((int nstream,Sfio_t* streams[],Sfio_t *out, register const char *delim,int dlen), (nstream, streams, out, delim, dlen)) __OTORP__(int nstream;Sfio_t* streams[];Sfio_t *out; register const char *delim;int dlen;){
register const char *cp;
register int d, n, more=1;
register Sfio_t *fp;
static int paste __PARAM__((int nstream,Sfio_t* streams[],Sfio_t *out, const char *delim,int dlen), (nstream, streams, out, delim, dlen)) __OTORP__(int nstream;Sfio_t* streams[];Sfio_t *out; const char *delim;int dlen;){
const char *cp;
int d, n, more=1;
Sfio_t *fp;
do
{
d = (dlen>0?0:-1);
@@ -135,7 +135,7 @@ static int paste __PARAM__((int nstream,Sfio_t* streams[],Sfio_t *out, register
}
if(++n<nstream && more && d>=0)
{
register int c;
int c;
if(d >= dlen)
d = 0;
if(c=delim[d++])
@@ -150,9 +150,9 @@ static int paste __PARAM__((int nstream,Sfio_t* streams[],Sfio_t *out, register
/*
* Handles paste -s, for file <in> to file <out> using delimiters <delim>
*/
static int spaste __PARAM__((Sfio_t *in,register Sfio_t* out,register const char *delim,int dlen), (in, out, delim, dlen)) __OTORP__(Sfio_t *in;register Sfio_t* out;register const char *delim;int dlen;){
register const char *cp;
register int d=0;
static int spaste __PARAM__((Sfio_t *in,Sfio_t* out,const char *delim,int dlen), (in, out, delim, dlen)) __OTORP__(Sfio_t *in;Sfio_t* out;const char *delim;int dlen;){
const char *cp;
int d=0;
if(cp = sfgetr(in,'\n',0))
{
if(sfwrite(out,cp,sfslen()-1) < 0)
@@ -162,7 +162,7 @@ static int spaste __PARAM__((Sfio_t *in,register Sfio_t* out,register const char
{
if(dlen)
{
register int c;
int c;
if(d >= dlen)
d = 0;
if(c=delim[d++])
@@ -176,10 +176,10 @@ static int spaste __PARAM__((Sfio_t *in,register Sfio_t* out,register const char
}
int
b_paste __PARAM__((int argc,register char *argv[]), (argc, argv)) __OTORP__(int argc;register char *argv[];){
register int n, sflag=0;
register Sfio_t *fp, **streams;
register char *cp, *delim = "\t"; /* default delimiter */
b_paste __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
int n, sflag=0;
Sfio_t *fp, **streams;
char *cp, *delim = "\t"; /* default delimiter */
int dlen;
NoP(id[0]);
@@ -101,7 +101,7 @@ static const char id[] = "\n@(#)pathchk (AT&T Bell Laboratories) 11/04/92\0\n";
* call pathconf and handle unlimited sizes
*/
static long mypathconf __PARAM__((const char *path, int op), (path, op)) __OTORP__(const char *path; int op;){
register long r;
long r;
errno=0;
if((r=pathconf(path, op))<0 && errno==0)
return(LONG_MAX);
@@ -112,9 +112,9 @@ static long mypathconf __PARAM__((const char *path, int op), (path, op)) __OTORP
* returns 1 if <path> passes test
*/
static int pathchk __PARAM__((char* path, int mode), (path, mode)) __OTORP__(char* path; int mode;){
register char *cp=path, *cpold;
register int c;
register long r,name_max,path_max;
char *cp=path, *cpold;
int c;
long r,name_max,path_max;
if(mode)
{
name_max = _POSIX_NAME_MAX;
@@ -217,8 +217,8 @@ err:
int
b_pathchk __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register int n, mode=0;
register char *cp;
int n, mode=0;
char *cp;
NoP(argc);
cmdinit(argv);
@@ -98,9 +98,9 @@ static const char id[] = "\n@(#)rev (AT&T Bell Laboratories) 11/11/92\0\n";
* reverse the characters within a line
*/
static int rev_char __PARAM__((Sfio_t *in, Sfio_t *out), (in, out)) __OTORP__(Sfio_t *in; Sfio_t *out;){
register int c;
register char *ep, *bp, *cp;
register int n;
int c;
char *ep, *bp, *cp;
int n;
while(cp = bp = sfgetr(in,'\n',0))
{
ep = bp + (n=sfslen()) -1;
@@ -117,10 +117,10 @@ static int rev_char __PARAM__((Sfio_t *in, Sfio_t *out), (in, out)) __OTORP__(Sf
}
int
b_rev __PARAM__((int argc, register char** argv), (argc, argv)) __OTORP__(int argc; register char** argv;){
register Sfio_t *fp;
register char *cp;
register int n, line=0;
b_rev __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
Sfio_t *fp;
char *cp;
int n, line=0;
NOT_USED(argc);
NoP(id[0]);
@@ -100,8 +100,8 @@
* in reverse order
*/
int rev_line __PARAM__((Sfio_t *in, Sfio_t *out, off_t start), (in, out, start)) __OTORP__(Sfio_t *in; Sfio_t *out; off_t start;){
register char *cp, *cpold;
register int n, nleft=0;
char *cp, *cpold;
int n, nleft=0;
char buff[BUFSIZE];
off_t offset;
if(sfseek(in,(off_t)0,SEEK_CUR) < 0)
@@ -96,8 +96,8 @@ static const char id[] = "\n@(#)rmdir (AT&T Bell Laboratories) 05/09/95\0\n";
int
b_rmdir __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register char* dir;
register int n;
char* dir;
int n;
NoP(argc);
NoP(id[0]);
@@ -104,9 +104,9 @@ static const char id[] = "\n@(#)tail (AT&T Bell Laboratories) 05/03/94\0\n";
* If file is seekable, position file to tail location and return offset
* Otherwise, return -1
*/
static off_t tailpos __PARAM__((register Sfio_t *fp, register long nitems, int delim), (fp, nitems, delim)) __OTORP__(register Sfio_t *fp; register long nitems; int delim;){
register int nleft,n;
register off_t offset, first, last;
static off_t tailpos __PARAM__((Sfio_t *fp, long nitems, int delim), (fp, nitems, delim)) __OTORP__(Sfio_t *fp; long nitems; int delim;){
int nleft,n;
off_t offset, first, last;
if((first=sfseek(fp,(off_t)0,SEEK_CUR))<0)
return((off_t)-1);
last = sfsize(fp);
@@ -145,8 +145,8 @@ static off_t tailpos __PARAM__((register Sfio_t *fp, register long nitems, int d
* This code handles tail from a pipe without any size limits
*/
static void pipetail __PARAM__((Sfio_t *infile, Sfio_t *outfile, int nitems, int delim), (infile, outfile, nitems, delim)) __OTORP__(Sfio_t *infile; Sfio_t *outfile; int nitems; int delim;){
register Sfio_t *out;
register int n=(2*SF_BUFSIZE), nleft=nitems, fno=0;
Sfio_t *out;
int n=(2*SF_BUFSIZE), nleft=nitems, fno=0;
off_t offset[2];
Sfio_t *tmp[2];
if(delim<0 && nitems < n)
@@ -188,8 +188,8 @@ static void pipetail __PARAM__((Sfio_t *infile, Sfio_t *outfile, int nitems, int
int
b_tail __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register Sfio_t *fp;
register int n, delim='\n', flags=0;
Sfio_t *fp;
int n, delim='\n', flags=0;
char *cp;
off_t offset;
long number = 10;
@@ -332,7 +332,7 @@ b_tail __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char
}
if(flags&F_FLAG)
{
register char *bufp;
char *bufp;
while(1)
{
sfsync(sfstdout);
+11 -11
View File
@@ -108,11 +108,11 @@ struct tee
*/
static int tee_write __PARAM__((Sfio_t* fp, const __V_* buf, int n, Sfdisc_t* handle), (fp, buf, n, handle)) __OTORP__(Sfio_t* fp; const __V_* buf; int n; Sfdisc_t* handle;){
register const char* bp;
register const char* ep;
register int* hp = ((struct tee*)handle)->fd;
register int fd = sffileno(fp);
register int r;
const char* bp;
const char* ep;
int* hp = ((struct tee*)handle)->fd;
int fd = sffileno(fp);
int r;
do
{
@@ -131,12 +131,12 @@ static int tee_write __PARAM__((Sfio_t* fp, const __V_* buf, int n, Sfdisc_t* ha
static Sfdisc_t tee_disc = { 0, tee_write, 0, 0, 0 };
int
b_tee __PARAM__((int argc, register char** argv), (argc, argv)) __OTORP__(int argc; register char** argv;){
register struct tee* tp = 0;
register int oflag = O_WRONLY|O_TRUNC|O_CREAT;
register int n;
register int* hp;
register char* cp;
b_tee __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
struct tee* tp = 0;
int oflag = O_WRONLY|O_TRUNC|O_CREAT;
int n;
int* hp;
char* cp;
NoP(id[0]);
cmdinit(argv);
@@ -96,8 +96,8 @@ static const char id[] = "\n@(#)tty (AT&T Bell Laboratories) 04/01/92\0\n";
int
b_tty __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
register int n,sflag=0;
register char *tty;
int n,sflag=0;
char *tty;
NoP(argc);
NoP(id[0]);
@@ -178,7 +178,7 @@ struct utsname
};
int
uname __PARAM__((register struct utsname* ut), (ut)) __OTORP__(register struct utsname* ut;){
uname __PARAM__((struct utsname* ut), (ut)) __OTORP__(struct utsname* ut;){
#ifdef HOSTTYPE
char* sys = 0;
char* arch = 0;
@@ -252,9 +252,9 @@ static int all = ((M_FLAG<<1)-1);
int
b_uname __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register int n;
register int flags = 0;
register char* s;
int n;
int flags = 0;
char* s;
char* sethost = 0;
struct utsname ut;
char* last = (char*)&ut.machine + sizeof(ut.machine);
@@ -106,7 +106,7 @@ static const char id[] = "\n@(#)uniq (AT&T Bell Laboratories) 04/01/93\0\n";
static char *sidebuff __PARAM__((int size), (size)) __OTORP__(int size;){
static int maxbuff;
static char *buff;
register char *cp=0;
char *cp=0;
if(size)
{
if(size <= maxbuff)
@@ -123,8 +123,8 @@ static char *sidebuff __PARAM__((int size), (size)) __OTORP__(int size;){
}
static int uniq __PARAM__((Sfio_t *fdin, Sfio_t *fdout, int fields, int chars, int mode), (fdin, fdout, fields, chars, mode)) __OTORP__(Sfio_t *fdin; Sfio_t *fdout; int fields; int chars; int mode;){
register int n, outsize=0;
register char *cp, *bufp, *outp;
int n, outsize=0;
char *cp, *bufp, *outp;
char *orecp, *sbufp=0, *outbuff;
int reclen,oreclen= -1,count=0, cwidth=0;
if(mode&C_FLAG)
@@ -225,8 +225,8 @@ static int uniq __PARAM__((Sfio_t *fdin, Sfio_t *fdout, int fields, int chars, i
int
b_uniq __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
register int n, mode=0;
register char *cp;
int n, mode=0;
char *cp;
int fields=0, chars=0;
Sfio_t *fpin, *fpout;
+5 -5
View File
@@ -98,7 +98,7 @@ static const char id[] = "\n@(#)wc (AT&T Bell Laboratories) 08/11/94\0\n";
#define ERRORMAX 125
static void printout __PARAM__((register Wc_t *wp, register char *name,register int mode), (wp, name, mode)) __OTORP__(register Wc_t *wp; register char *name;register int mode;){
static void printout __PARAM__((Wc_t *wp, char *name,int mode), (wp, name, mode)) __OTORP__(Wc_t *wp; char *name;int mode;){
if(mode&WC_LINES)
sfprintf(sfstdout," %7lu",wp->lines);
if(mode&WC_WORDS)
@@ -109,10 +109,10 @@ static void printout __PARAM__((register Wc_t *wp, register char *name,register
}
int
b_wc __PARAM__((int argc,register char **argv), (argc, argv)) __OTORP__(int argc;register char **argv;){
register char *cp;
register int mode=0, n;
register Wc_t *wp;
b_wc __PARAM__((int argc,char **argv), (argc, argv)) __OTORP__(int argc;char **argv;){
char *cp;
int mode=0, n;
Wc_t *wp;
Sfio_t *fp;
long tlines=0, twords=0, tchars=0;
struct stat statb;
@@ -97,7 +97,7 @@
#define endline(c) (((signed char)-1)<0?(c)<0:(c)==((char)-1))
Wc_t *wc_init __PARAM__((char *space), (space)) __OTORP__(char *space;){
register int n;
int n;
Wc_t *wp;
if(!(wp = (Wc_t*)stakalloc(sizeof(Wc_t))))
@@ -117,12 +117,12 @@ Wc_t *wc_init __PARAM__((char *space), (space)) __OTORP__(char *space;){
* compute the line, word, and character count for file <fd>
*/
wc_count __PARAM__((Wc_t *wp, Sfio_t *fd), (wp, fd)) __OTORP__(Wc_t *wp; Sfio_t *fd;){
register signed char *space = wp->space;
register unsigned char *cp;
register long nwords;
register int c;
register unsigned char *endbuff;
register int lasttype = 1;
signed char *space = wp->space;
unsigned char *cp;
long nwords;
int c;
unsigned char *endbuff;
int lasttype = 1;
unsigned int lastchar;
unsigned char *buff;
wp->lines = nwords = wp->chars = 0;