scripts/nostring
test/hello
test/hello.txt
+usr.bin/ar11
+usr.bin/basename
+usr.bin/cal
+usr.bin/cb
+usr.bin/checkeq
+usr.bin/col
+usr.bin/comm
+usr.bin/crypt
+usr.bin/deroff
+usr.bin/fgrep
+usr.bin/file
+usr.bin/join
+usr.bin/look
+usr.bin/mesg
+usr.bin/ptx
+usr.bin/ranlib
+usr.bin/rev
+usr.bin/sleep
+usr.bin/sort
+usr.bin/spline
+usr.bin/split
+usr.bin/sum
+usr.bin/tabs
+usr.bin/tc
+usr.bin/tk
+usr.bin/touch
+usr.bin/tr
+usr.bin/tsort
+usr.bin/tty
+usr.bin/uniq
+usr.bin/units
xify/cc
xify/ld
xify/xify
# To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
DEFS= -DTELL -DVFORK -DFILEC
-CFLAGS= $(DEFS) -O -g
+CFLAGS= $(DEFS) -O
XSTR= /usr/ucb/xstr
AS= as
RM= -rm
# @(#)Makefile 5.4 (Berkeley) 9/5/85
#
-SRCS= chdir.c chmod.c chown.c chroot.c close.c dup2.c dup.c execve.c \
+SRCS= brk.c chdir.c chmod.c chown.c chroot.c close.c dup2.c dup.c execve.c \
_exit.c fchmod.c fchown.c fork.c fstat.c ftruncate.c getdtablesize.c \
getegid.c geteuid.c getgid.c getpagesize.c getpgrp.c getpid.c \
getppid.c getrusage.c gettimeofday.c getuid.c ioctl.c link.c linux.c \
- lseek.c lstat.c read.c readlink.c readv.c sbrk.c setpgrp.c \
+ lseek.c lstat.c pipe.c read.c readlink.c readv.c sbrk.c setpgrp.c \
setregid.c setreuid.c settimeofday.c sigblock.c sigpause.c \
sigsetmask.c sigvec.c stat.c symlink.c sync.c truncate.c umask.c \
unlink.c utimes.c vopen.c wait.c wait3.c write.c writev.c
-OBJS= chdir.o chmod.o chown.o chroot.o close.o dup2.o dup.o execve.o \
+OBJS= brk.o chdir.o chmod.o chown.o chroot.o close.o dup2.o dup.o execve.o \
_exit.o fchmod.o fchown.o fork.o fstat.o ftruncate.o getdtablesize.o \
getegid.o geteuid.o getgid.o getpagesize.o getpgrp.o getpid.o \
getppid.o getrusage.o gettimeofday.o getuid.o ioctl.o link.o linux.o \
- lseek.o lstat.o read.o readlink.o readv.o sbrk.o setpgrp.o \
+ lseek.o lstat.o pipe.o read.o readlink.o readv.o sbrk.o setpgrp.o \
setregid.o setreuid.o settimeofday.o sigblock.o sigpause.o \
sigsetmask.o sigvec.o stat.o symlink.o sync.o truncate.o umask.o \
unlink.o utimes.o vopen.o wait.o wait3.o write.o writev.o
--- /dev/null
+#include <nox_errno.h>
+#include <nox_unistd.h>
+
+#include <sys/errno.h>
+#include <sys/proc.h>
+#include "linux.h"
+
+int brk(a) void *a; {
+ if (nox_brk(a)) {
+ errno = htot_errno(nox_errno);
+ return -1;
+ }
+ return 0;
+}
#include <nox_errno.h>
#include <nox_stdlib.h>
#include <nox_string.h>
-#include <sys/nox_resource.h>
-#include <sys/nox_signal.h>
-#include <sys/nox_types.h>
#include <sys/nox_wait.h>
#include <nox_unistd.h>
#include <string.h>
#include <sys/dir.h>
#include <sys/errno.h>
-#include <sys/resource.h>
-#include <sys/signal.h>
-#include <sys/types.h>
#include <sys/wait.h>
#include "linux.h"
if (m & S_ISUID)
res |= nox_S_ISUID;
switch (m & S_IFMT) {
- /*case S_IFIFO:
+ case /*S_IFIFO*/ 0:
res |= nox_S_IFIFO;
- break;*/
+ break;
case S_IFCHR:
res |= nox_S_IFCHR;
break;
if (m & nox_S_ISUID)
res |= S_ISUID;
switch (m & nox_S_IFMT) {
- /*case nox_S_IFIFO:
- res |= S_IFIFO;
- break;*/
+ case nox_S_IFIFO:
+ /*res |= S_IFIFO; apparently 4.3bsd kernel returns 0, check*/
+ break;
case nox_S_IFCHR:
res |= S_IFCHR;
break;
#define _LINUX_SYS_LINUX_H_
#include <nox_signal.h>
+#include <sys/nox_resource.h>
#include <sys/nox_stat.h>
+#include <sys/nox_types.h>
+#include <sys/resource.h>
#include <sys/stat.h>
+#include <sys/types.h>
extern nox_int ttoh_errno[];
extern nox_int ttoh_signo[];
--- /dev/null
+#include <nox_errno.h>
+#include <nox_unistd.h>
+
+#include <errno.h>
+#include <sys/file.h>
+#include "linux.h"
+
+int pipe(f) int f[2]; {
+ nox_int fds[2];
+
+ if (nox_pipe(fds)) {
+ errno = htot_errno(nox_errno);
+ return -1;
+ }
+ f[0] = (int)fds[0];
+ f[1] = (int)fds[1];
+ return 0;
+}
#include <sys/file.h>
/*#include <sys/proc.h> gen.h*/
-void *brk(a) void *a; {
+int brk(a) void *a; {
write(2, "brk()\n", 6);
abort();
}
rm -rf cross
mkdir -p cross/bin
mkdir -p cross/lib
+mkdir -p cross/usr/bin
mkdir -p cross/usr/include
mkdir -p cross/usr/lib
mkdir -p lib/libc/sys/profiled
(cd lib/libc && make.sh clean && make.sh && make.sh install)
(cd bin && make.sh clean && make.sh SUBDIR="as csh diff sed sh tp" NSTD= KMEM= && make.sh SUBDIR="as csh diff sed sh tp" NSTD= KMEM= install)
+(cd usr.bin && make.sh clean && make.sh SUBDIR= NSTD= KMEM= && make.sh SUBDIR= NSTD= KMEM= install)
#(cd test && make clean && make)
#!/bin/sh
-ROOT=../..
+ROOT=`dirname $0`/..
ROOT=`cd $ROOT && pwd`
SCRIPTS=$ROOT/scripts
set *.c
fi
+all_h=`echo *.h`
+if test "$all_h" = "*.h"
+then
+ all_h=
+fi
+
while test $# -ge 1
do
o=`basename $1 .c`.o
rm -f $o
$SCRIPTS/make.sh $o 2>x
$SCRIPTS/nonvoid.sh <x >y
- sed -f y -i $1 *.h
+ sed -f y -i $1 $all_h
rm -f $o
$SCRIPTS/make.sh $o 2>x
$SCRIPTS/isvoid.sh <x >y
- sed -f y -i $1 *.h
+ sed -f y -i $1 $all_h
shift
done
#!/bin/sh
+
ROOT=`dirname $0`/..
-$ROOT/scripts/errfunc.sh |grep "‘return’ with a value, in function returning void" |sed -e 's/:.*//' |sort |uniq |sed -e 's/.*/s\/^\\(static \\)\\?void &\\( __P(\\)\\?(\/\\1int &\\2(\//'
+ROOT=`cd $ROOT && pwd`
+SCRIPTS=$ROOT/scripts
+
+$SCRIPTS/errfunc.sh |grep "‘return’ with a value, in function returning void" |sed -e 's/:.*//' |sort |uniq |sed -e 's/.*/s\/^\\(static \\)\\?void &\\( __P(\\)\\?(\/\\1int &\\2(\//'
#!/bin/sh
+
ROOT=`dirname $0`/..
-$ROOT/scripts/errfunc.sh |grep "control reaches end of non-void function\|‘return’ with no value, in function returning non-void\|no return statement in function returning non-void" |sed -e 's/:.*//' |sort |uniq |sed -e 's/.*/s\/^\\(static \\)\\?\\(int \\)\\?&\\( __P(\\)\\?(\/\\1void &\\3(\//'
+ROOT=`cd $ROOT && pwd`
+SCRIPTS=$ROOT/scripts
+
+$SCRIPTS/errfunc.sh |grep "control reaches end of non-void function\|‘return’ with no value, in function returning non-void\|no return statement in function returning non-void" |sed -e 's/:.*//' |sort |uniq |sed -e 's/.*/s\/^\\(static \\)\\?\\(int \\)\\?&\\( __P(\\)\\?(\/\\1void &\\3(\//'
void _exit __P((int s)) NORETURN;
/* sys/brk.c */
-void *brk __P((void *a));
+int brk __P((void *a));
/* sys/chdir.c */
int chdir __P((char *s));
/*int tcmd();*/
/*int pcmd();*/
/*int mcmd();*/
-int (*comfun)();
+void (*comfun) __P((void));
char flg[26];
char **namv;
int namc;
#endif
#endif
-int main __P((int argc, char *argv[]));
-int setcom __P((int (*fun)(void)));
-int rcmd __P((void));
-int dcmd __P((void));
-int xcmd __P((void));
-int pcmd __P((void));
-int mcmd __P((void));
-int tcmd __P((void));
-int init __P((void));
+void main __P((int argc, char *argv[]));
+void setcom __P((void (*fun)(void)));
+void rcmd __P((void));
+void dcmd __P((void));
+void xcmd __P((void));
+void pcmd __P((void));
+void mcmd __P((void));
+void tcmd __P((void));
+void init __P((void));
int getaf __P((void));
-int usage __P((void));
-int noar __P((void));
-int sigdone __P((void));
+void usage __P((void));
+void noar __P((void));
+void sigdone __P((void));
int done __P((int c));
int notfound __P((void));
-int cleanup __P((void));
-int install __P((void));
-int movefil __P((int f));
+void cleanup __P((void));
+void install __P((void));
+void movefil __P((int f));
int stats __P((void));
-int copyfil __P((int fi, int fo, int flag));
+void copyfil __P((int fi, int fo, int flag));
int getdir __P((void));
int match __P((void));
-int bamatch __P((void));
-int phserr __P((void));
-int mesg __P((int c));
+void bamatch __P((void));
+void phserr __P((void));
+void mesg __P((int c));
char *trim __P((char *s));
-int longt __P((void));
-int pmode __P((void));
-int select __P((int *pairp));
-int wrerr __P((void));
+void longt __P((void));
+void pmode __P((void));
+void select __P((int *pairp));
+void wrerr __P((void));
struct ar_hdr swaphdr __P((struct ar_hdr hdr));
-int main(argc, argv) int argc; char *argv[]; {
+void main(argc, argv) int argc; char *argv[]; {
register i;
register char *cp;
for(i=0; signum[i]; i++)
if(signal(signum[i], SIG_IGN) != SIG_IGN)
- signal(signum[i], sigdone);
+ signal(signum[i], (void (*) __P((int sig)))sigdone);
if(argc < 3)
usage();
cp = argv[1];
done(notfound());
}
-int setcom(fun) int (*fun)(); {
+void setcom(fun) void (*fun) __P((void)); {
if(comfun != 0) {
fprintf(stderr, "ar11: only one of [%s] allowed\n", man);
comfun = fun;
}
-int rcmd() {
+void rcmd() {
register f;
init();
cleanup();
}
-int dcmd() {
+void dcmd() {
init();
if(getaf())
install();
}
-int xcmd() {
+void xcmd() {
register f;
if(getaf())
}
}
-int pcmd() {
+void pcmd() {
if(getaf())
noar();
}
}
-int mcmd() {
+void mcmd() {
init();
if(getaf())
install();
}
-int tcmd() {
+void tcmd() {
if(getaf())
noar();
}
}
-int init() {
+void init() {
static short mbuf = fixshort(ARMAG);
tfnam = mktemp("/tmp/vXXXXX");
return(0);
}
-int usage() {
+void usage() {
printf("usage: ar11 [%s][%s] archive files ...\n", opt, man);
done(1);
}
-int noar() {
+void noar() {
fprintf(stderr, "ar11: %s does not exist\n", arnam);
done(1);
}
-int sigdone() {
+void sigdone() {
done(100);
}
return(n);
}
-int cleanup() {
+void cleanup() {
register i, f;
for(i=0; i<namc; i++) {
install();
}
-int install() {
+void install() {
register i;
for(i=0; signum[i]; i++)
- signal(signum[i], (int (*)())1);
+ signal(signum[i], SIG_IGN);
close(af);
af = creat(arnam, 0666);
if(af < 0) {
* insert the file 'file'
* into the temporary file
*/
-int movefil(f) int f; {
+void movefil(f) int f; {
register char *cp;
register i;
* copy next file
* size given in arbuf
*/
-int copyfil(fi, fo, flag) int fi; int fo; int flag; {
+void copyfil(fi, fo, flag) int fi; int fo; int flag; {
register i, o;
int pe;
return(0);
}
-int bamatch() {
+void bamatch() {
register f;
switch(bastate) {
}
}
-int phserr() {
+void phserr() {
fprintf(stderr, "ar11: phase error on %s\n", file);
}
-int mesg(c) int c; {
+void mesg(c) int c; {
if(flg['v'-'a'])
if(c != 'c' || flg['v'-'a'] > 1)
#define XOTH 01
#define STXT 01000
-int longt() {
+void longt() {
register char *cp;
pmode();
int *m[] = { m1, m2, m3, m4, m5, m6, m7, m8, m9};
-int pmode() {
+void pmode() {
register int **mp;
for (mp = &m[0]; mp < &m[9];)
select(*mp++);
}
-int select(pairp) int *pairp; {
+void select(pairp) int *pairp; {
register int n, *ap;
ap = pairp;
putchar(*ap);
}
-int wrerr() {
+void wrerr() {
perror("ar write error");
done(1);
}
#endif
#endif
-int main __P((int argc, char *argv[]));
+void main __P((int argc, char *argv[]));
int number __P((char *str));
-int pstr __P((char *str, int n));
-int cal __P((int m, int y, char *p, int w));
+void pstr __P((char *str, int n));
+void cal __P((int m, int y, char *p, int w));
int jan1 __P((int yr));
-int main(argc, argv) int argc; char *argv[]; {
+void main(argc, argv) int argc; char *argv[]; {
register y, i, j;
int m;
return(n);
}
-int pstr(str, n) char *str; int n; {
+void pstr(str, n) char *str; int n; {
register i;
register char *s;
30, 31, 30, 31,
};
-int cal(m, y, p, w) int m; int y; char *p; int w; {
+void cal(m, y, p, w) int m; int y; char *p; int w; {
register d, i;
register char *s;
#endif
#endif
-int main __P((int argc, char argv[]));
-int ptabs __P((void));
+void main __P((int argc, char argv[]));
+void ptabs __P((void));
int getch __P((void));
-int _puts __P((void));
+void _puts __P((void));
int lookup __P((char *tab[]));
int getstr __P((void));
-int gotelse __P((void));
+void gotelse __P((void));
int getnl __P((void));
-int comment __P((void));
+void comment __P((void));
-int main(argc, argv) int argc; char argv[]; {
+void main(argc, argv) int argc; char argv[]; {
while((c = getch()) != EOF){
switch(c){
case ' ':
}
}
}
-int ptabs() {
+void ptabs() {
int i;
for(i=0; i < tabs; i++)printf("\t");
}
peek = -1;
return(lastchar);
}
-int _puts() {
+void _puts() {
if(j > 0){
if(sflg != 0){
ptabs();
}
else return(ch);
}
-int gotelse() {
+void gotelse() {
tabs = stabs[clevel][iflev];
pflg[level] = spflg[clevel][iflev];
ind[level] = sind[clevel][iflev];
}
return(0);
}
-int comment() {
+void comment() {
int i = j;
while ((c = getch()) != EOF) {
#endif
#endif
-int main __P((int argc, char **argv));
-int check __P((FILE *f));
+void main __P((int argc, char **argv));
+void check __P((FILE *f));
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
if (argc <= 1)
check(stdin);
}
}
-int check(f) FILE *f; {
+void check(f) FILE *f; {
int start, line, eq, ndel, totdel;
char in[600], *p;
#endif
int main __P((int argc, char **argv));
-int outc __P((int c));
-int store __P((int lno));
-int fetch __P((int lno));
-int emit __P((char *s, int lineno));
-int incr __P((void));
-int decr __P((void));
+void outc __P((int c));
+void store __P((int lno));
+void fetch __P((int lno));
+void emit __P((char *s, int lineno));
+void incr __P((void));
+void decr __P((void));
int main(argc, argv) int argc; char **argv; {
int i;
exit(0);
}
-int outc(c) int c; {
+void outc(c) int c; {
if (lp > cp) {
line = lbuff;
lp = 0;
}
}
-int store(lno) int lno; {
+void store(lno) int lno; {
void *malloc();
lno %= PL;
strcpy (page[lno],lbuff);
}
-int fetch(lno) int lno; {
+void fetch(lno) int lno; {
register char *p;
lno %= PL;
if (page[lno])
strcpy (line, page[lno]);
}
-int emit(s, lineno) char *s; int lineno; {
+void emit(s, lineno) char *s; int lineno; {
static int cline = 0;
register int ncp;
register char *p;
}
}
-int incr() {
+void incr() {
store (ll++);
if (ll > llh)
llh = ll;
fetch (ll);
}
-int decr() {
+void decr() {
if (ll > mustwr - PL) {
store (ll--);
fetch (ll);
int main __P((int argc, char *argv[]));
int rd __P((FILE *file, char *buf));
-int wr __P((char *str, int n));
+void wr __P((char *str, int n));
int copy __P((FILE *ibuf, char *lbuf, int n));
int compare __P((char *a, char *b));
FILE *openfil __P((char *s));
return(-1);
}
-int wr(str, n) char *str; int n; {
+void wr(str, n) char *str; int n; {
switch(n) {
ar11.c sys/inode.h
ar11.c sys/select.h
col.c netns/spidp.h
+crypt.c sys/ioctl.h
deroff.c ctype.h
deroff.c vax/reg.h
+ptx.c sys/ioctl.h
tabs.c netns/spidp.h
tabs.c vax/reg.h
tk.c netns/spidp.h
/*#include <strings.h> gen.h*/
/*#include <sys/exec.h> gen.h*/
#include <sys/file.h>
-#include <sys/ioctl.h>
/*#include <sys/proc.h> gen.h*/
#include <sys/wait.h>
#endif
#endif
-int setup __P((char *pw));
-int main __P((int argc, char *argv[]));
-int shuffle __P((char deck[]));
+void setup __P((char *pw));
+void main __P((int argc, char *argv[]));
+void shuffle __P((char deck[]));
-int setup(pw) char *pw; {
+void setup(pw) char *pw; {
int ic, i, k, temp, pf[2];
int pid, wpid;
unsigned random;
t2[t1[i]&MASK] = i;
}
-int main(argc, argv) int argc; char *argv[]; {
+void main(argc, argv) int argc; char *argv[]; {
register i, n1, n2, nr1, nr2;
int secureflg = 0;
}
}
-int shuffle(deck) char deck[]; {
+void shuffle(deck) char deck[]; {
int i, ic, k, temp;
unsigned random;
static long seed = 123;
int argconcat = 0; /* concat arguments together (-me only) */
#define tomac(c1, c2) ((((c1) & 0xFF) << 8) | ((c2) & 0xFF))
-#define frommac(src, c1, c2) (((c1)=((src)>>8)&0xFF),((c2) =(src)&0xFF))
+#define frommac1(src, c1) ((c1)=((src)>>8)&0xFF)
+#define frommac2(src, c2) ((c2)=(src)&0xFF)
+#define frommac(src, c1, c2) (frommac1(src, c1),frommac2(src, c2))
struct mactab{
int condition;
pacmac macname;
- int (*func)();
+ int (*func) __P((pacmac c12));
};
extern struct mactab troffmactab[];
extern struct mactab ppmactab[];
#endif
#endif
-int main __P((int ac, char **av));
+void main __P((int ac, char **av));
int skeqn __P((void));
FILE *opn __P((register char *p));
int eof __P((void));
-int getfname __P((void));
+void getfname __P((void));
int fatal __P((char *s, char *p));
-int textline __P((char *str, int _const));
+void textline __P((char *str, int _const));
int work __P((void));
-int regline __P((int (*pfunc)(void), int _const));
-int macro __P((void));
-int tbl __P((void));
-int stbl __P((void));
-int eqn __P((void));
-int backsl __P((void));
+void regline __P((void (*pfunc)(char *str, int _const), int _const));
+void macro __P((void));
+void tbl __P((void));
+void stbl __P((void));
+void eqn __P((void));
+void backsl __P((void));
char *copys __P((register char *s));
-int sce __P((void));
-int refer __P((int c1));
-int inpic __P((void));
+void sce __P((void));
+void refer __P((int c1));
+void inpic __P((void));
int _C1get __P((void));
int _Cget __P((void));
-int msputmac __P((register char *s, int _const));
-int msputwords __P((int macline));
-int meputmac __P((register char *cp, int _const));
-int meputwords __P((int macline));
-int noblock __P((int a1, int a2));
-int EQ __P((void));
-int domacro __P((void));
-int PS __P((void));
-int skip __P((void));
-int intbl __P((void));
-int outtbl __P((void));
-int so __P((void));
-int nx __P((void));
-int skiptocom __P((void));
+void msputmac __P((register char *s, int _const));
+void msputwords __P((int macline));
+void meputmac __P((register char *cp, int _const));
+void meputwords __P((int macline));
+void noblock __P((int a1, int a2));
+int EQ __P((pacmac c12));
+int domacro __P((pacmac c12));
+int PS __P((pacmac c12));
+int skip __P((pacmac c12));
+int intbl __P((pacmac c12));
+int outtbl __P((pacmac c12));
+int so __P((pacmac c12));
+int nx __P((pacmac c12));
+int skiptocom __P((pacmac c12));
int PP __P((pacmac c12));
-int AU __P((void));
+int AU __P((pacmac c12));
int SH __P((pacmac c12));
-int UX __P((void));
+int UX __P((pacmac c12));
int MMHU __P((pacmac c12));
int mesnblock __P((pacmac c12));
int mssnblock __P((pacmac c12));
-int nf __P((void));
-int ce __P((void));
+int nf __P((pacmac c12));
+int ce __P((pacmac c12));
int meip __P((pacmac c12));
int mepp __P((pacmac c12));
int mesh __P((pacmac c12));
int mefont __P((pacmac c12));
int manfont __P((pacmac c12));
int manpp __P((pacmac c12));
-int defcomline __P((pacmac c12));
-int comline __P((void));
+void defcomline __P((pacmac c12));
+void comline __P((void));
int macsort __P((struct mactab *p1, struct mactab *p2));
int sizetab __P((register struct mactab *mp));
struct mactab *macfill __P((register struct mactab *dst, register struct mactab *src));
-int buildtab __P((struct mactab **r_back, int *r_size));
+void buildtab __P((struct mactab **r_back, int *r_size));
-int main(ac, av) int ac; char **av; {
+void main(ac, av) int ac; char **av; {
register int i;
int errflg = 0;
- register optchar;
FILE *opn();
int kflag = NO;
char *p;
return(C);
}
-int getfname() {
+void getfname() {
register char *p;
struct chain {
struct chain *nextp;
}
/*ARGSUSED*/
-int textline(str, _const) char *str; int _const; {
+void textline(str, _const) char *str; int _const; {
if (wordflag) {
msputwords(0);
return;
}
}
-int regline(pfunc, _const) int (*pfunc)(); int _const; {
+void regline(pfunc, _const) void (*pfunc) __P((char *str, int _const)); int _const; {
line[0] = c;
lp = line;
for( ; ; ) {
(*pfunc)(line, _const);
}
-int macro() {
+void macro() {
if(msflag){
do {
SKIP;
inmacro = YES;
}
-int tbl() {
+void tbl() {
while(C != '.');
SKIP;
intable = YES;
}
-int stbl() {
+void stbl() {
while(C != '.');
SKIP_TO_COM;
if(c != 'T' || C != 'E'){
}
}
-int eqn() {
+void eqn() {
register int c1, c2;
register int dflg;
char last;
}
}
-int backsl() /* skip over a complete backslash construction */ {
+void backsl() /* skip over a complete backslash construction */ {
int bdelim;
sw:
return(t0);
}
-int sce() {
+void sce() {
register char *ap;
register int n, i;
char a[10];
}
}
-int refer(c1) int c1; {
+void refer(c1) int c1; {
register int c2;
if(c1 != '\n')
SKIP;
}
}
-int inpic() {
+void inpic() {
register int c1;
register char *p1;
SKIP;
/*
* Put out a macro line, using ms and mm conventions.
*/
-int msputmac(s, _const) register char *s; int _const; {
+void msputmac(s, _const) register char *s; int _const; {
register char *t;
register found;
int last;
/*
* put out words (for the -w option) with ms and mm conventions
*/
-int msputwords(macline) int macline; /* is this is a macro line */ {
+void msputwords(macline) int macline; /* is this is a macro line */ {
register char *p, *p1;
int i, nlet;
#define SKIPBLANK(cp) while(*cp == ' ' || *cp == '\t') { cp++; }
#define SKIPNONBLANK(cp) while(*cp !=' ' && *cp !='\cp' && *cp !='\0') { cp++; }
-int meputmac(cp, _const) register char *cp; int _const; {
+void meputmac(cp, _const) register char *cp; int _const; {
register char *np;
int found;
int argno;
/*
* put out words (for the -w option) with ms and mm conventions
*/
-int meputwords(macline) int macline; {
+void meputwords(macline) int macline; {
msputwords(macline);
}
/*
* ([lqbzcdf]
*/
-int noblock(a1, a2) int a1; int a2; {
+void noblock(a1, a2) int a1; int a2; {
register int c1,c2;
register int eqnf;
int lct;
}
}
-int EQ() {
+int EQ(c12) pacmac c12; {
eqn();
return(0);
}
-int domacro() {
+int domacro(c12) pacmac c12; {
macro();
return(0);
}
-int PS() {
+int PS(c12) pacmac c12; {
if (!msflag) {
inpic();
} else {
return(0);
}
-int skip() {
+int skip(c12) pacmac c12; {
SKIP;
return(0);
}
-int intbl() {
+int intbl(c12) pacmac c12; {
if(msflag){
stbl();
}
return(0);
}
-int outtbl() { intable = NO; }
+int outtbl(c12) pacmac c12; {
+ intable = NO;
+ return(0);
+}
-int so() {
+int so(c12) pacmac c12; {
getfname();
if( fname[0] )
infile = *++filesp = opn( fname );
return(0);
}
-int nx() {
+int nx(c12) pacmac c12; {
getfname();
if(fname[0] == '\0') exit(0);
if(infile != stdin)
infile = *filesp = opn(fname);
return(0);
}
-int skiptocom() { SKIP_TO_COM; return(COMX); }
+int skiptocom(c12) pacmac c12; {
+ SKIP_TO_COM;
+ return(COMX);
+}
int PP(c12) pacmac c12; {
int c1, c2;
putchar('\n');
return(0);
}
-int AU() {
+int AU(c12) pacmac c12; {
if(mac==MM) {
return(0);
} else {
}
}
-int UX() {
+int UX(c12) pacmac c12; {
if(wordflag)
printf("UNIX\n");
else
}
int mesnblock(c12) pacmac c12; {
- int c1, c2;
+ int c2;
- frommac(c12, c1, c2);
+ frommac2(c12, c2);
noblock(')',c2);
return(0);
}
int mssnblock(c12) pacmac c12; {
- int c1, c2;
+ int c1;
- frommac(c12, c1, c2);
+ frommac1(c12, c1);
noblock(c1,'E');
return(0);
}
-int nf() {
+int nf(c12) pacmac c12; {
noblock('f','i');
return(0);
}
-int ce() {
+int ce(c12) pacmac c12; {
sce();
return(0);
}
return(mepp(c12));
}
-int defcomline(c12) pacmac c12; {
+void defcomline(c12) pacmac c12; {
int c1, c2;
frommac(c12, c1, c2);
--inmacro;
}
-int comline() {
+void comline() {
register int c1;
register int c2;
pacmac c12;
return(dst);
}
-int buildtab(r_back, r_size) struct mactab **r_back; int *r_size; {
+void buildtab(r_back, r_size) struct mactab **r_back; int *r_size; {
int size;
struct mactab *p, *p1, *p2;
p = macfill(p, p1);
p = macfill(p, p2);
- qsort(back, size, sizeof(struct mactab), macsort);
+ qsort(back, size, sizeof(struct mactab), (int (*) __P((void *p0, void *p1)))macsort);
*r_size = size;
*r_back = back;
}
#endif
int main __P((int argc, char **argv));
-int execute __P((char *file));
+void execute __P((char *file));
int getargc __P((void));
-int cgotofn __P((void));
+void cgotofn __P((void));
int overflo __P((void));
-int cfail __P((void));
+void cfail __P((void));
int main(argc, argv) int argc; char **argv; {
while (--argc > 0 && (++argv)[0][0]=='-')
# define ccomp(a,b) (yflag ? lca(a)==lca(b) : a==b)
# define lca(x) (isupper(x) ? tolower(x) : x)
-int execute(file) char *file; {
+void execute(file) char *file; {
register struct words *c;
register ccount;
- register char ch;
register char *p;
static char *buf;
static int blksize;
return(c);
}
-int cgotofn() {
+void cgotofn() {
register c;
register struct words *s;
fprintf(stderr, "wordlist too large\n");
exit(2);
}
-int cfail() {
+void cfail() {
struct words *queue[QSIZE];
struct words **front, **rear;
struct words *state;
/*#include <stdio.h>*/
/*#include <ctype.h>*/
/*#include <a.out.h>*/
-int errno;
-int sys_nerr;
-char *sys_errlist[];
+extern int errno;
+extern int sys_nerr;
+extern char *sys_errlist[];
int in;
int i = 0;
char buf[BUFSIZ];
#endif
int main __P((int argc, char **argv));
-int type __P((char *file));
+void type __P((char *file));
int oldo __P((char *cp));
int troffint __P((char *bp, int n));
int lookup __P((char *tab[]));
FILE *fl;
register char *p;
char ap[MAXPATHLEN + 1];
- extern char _sobuf[];
if (argc < 2) {
fprintf(stderr, "usage: %s file ...\n", argv[0]);
exit(0);
}
-int type(file) char *file; {
+void type(file) char *file; {
int j,nl;
char ch;
struct stat mbuf;
printf(" with garbage\n");
return;
}
- /* if next few lines in then read whole file looking for nulls ...
- while((in = read(ifile,buf,BUFSIZ)) > 0)
- for(i = 0; i < in; i++)
- if((buf[i]&0377) > 127){
- printf(" with garbage\n");
- return;
- }
- /*.... */
+ /* if next few lines in then read whole file looking for nulls ... */
+ /*while((in = read(ifile,buf,BUFSIZ)) > 0)*/
+ /* for(i = 0; i < in; i++)*/
+ /* if((buf[i]&0377) > 127){*/
+ /* printf(" with garbage\n");*/
+ /* return;*/
+ /* }*/
printf("\n");
}
#endif
#endif
-int main __P((int argc, char *argv[]));
-int printhdr __P((void));
-int stats __P((int dn));
-int stat1 __P((int o));
-int read_names __P((void));
+void main __P((int argc, char *argv[]));
+void printhdr __P((void));
+void stats __P((int dn));
+void stat1 __P((int o));
+void read_names __P((void));
-int main(argc, argv) int argc; char *argv[]; {
+void main(argc, argv) int argc; char *argv[]; {
extern char *ctime();
register i;
int iter, ndrives;
}
if (argc > 1)
iter = atoi(argv[1]);
- signal(SIGCONT, printhdr);
+ signal(SIGCONT, (void (*) __P((int sig)))printhdr);
loop:
if (--tohdr == 0)
printhdr();
}
}
-int printhdr() {
+void printhdr() {
register int i;
printf(" tty");
tohdr = 19;
}
-int stats(dn) int dn; {
+void stats(dn) int dn; {
register i;
double atime, words, xtime, itime;
s.dk_seek[dn] ? itime*1000./s.dk_seek[dn] : 0.0);
}
-int stat1(o) int o; {
+void stat1(o) int o; {
register i;
double time;
#include <vaxuba/ubavar.h>
#include <vaxmba/mbavar.h>
-int read_names() {
+void read_names() {
struct mba_device mdev;
register struct mba_device *mp;
struct mba_driver mdrv;
int main __P((int argc, char *argv[]));
int input __P((int n));
-int output __P((int on1, int on2));
+void output __P((int on1, int on2));
int error __P((char *fmt, ...));
int cmp __P((char *s1, char *s2));
return(i);
}
-int output(on1, on2) /* print items from olist */ int on1; int on2; {
+void output(on1, on2) /* print items from olist */ int on1; int on2; {
int i;
char *temp;
#endif
#endif
-int main __P((int argc, char **argv));
+void main __P((int argc, char **argv));
int compare __P((register char *s, register char *t));
int getword __P((char *w));
-int canon __P((char *old, char *new));
+void canon __P((char *old, char *new));
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
register c;
long top,bot,mid;
while(argc>=2 && *argv[1]=='-') {
return(1);
}
-int canon(old, new) char *old; char *new; {
+void canon(old, new) char *old; char *new; {
register c;
for(;;) {
*new = c = *old++;
int main __P((int argc, char *argv[]));
int error __P((char *s));
-int newmode __P((int m));
+void newmode __P((int m));
int main(argc, argv) int argc; char *argv[]; {
int r=0;
exit(-1);
}
-int newmode(m) int m; {
+void newmode(m) int m; {
if(chmod(tty,m)<0)
error("cannot change mode");
}
#include <stdio.h>
/*#include <sys/exec.h> gen.h*/
#include <sys/file.h>
-#include <sys/ioctl.h>
/*#include <sys/param.h> gen.h*/
/*#include <sys/proc.h> gen.h*/
/*#include <sys/signal.h> gen.h*/
#define TILDE 0177
#define SORT "/usr/bin/sort"
#define N 30
-#define MAX N*BUFSIZ
+#define _MAX N*BUFSIZ
#define LMAX 200
#define MAXT 2048
#define MASK 03777
#endif
int main __P((int argc, char **argv));
-int msg __P((char *s, char *arg));
+void msg __P((char *s, char *arg));
int diag __P((char *s, char *arg));
char *getline __P((void));
-int cmpline __P((char *pend));
+void cmpline __P((char *pend));
int cmpword __P((char *cpp, char *pend, char *hpp));
-int putline __P((char *strt, char *end));
-int getsort __P((void));
+void putline __P((char *strt, char *end));
+void getsort __P((void));
char *rtrim __P((char *a, char *c, int d));
char *ltrim __P((char *c, char *b, int d));
-int putout __P((char *strt, char *end));
+void putout __P((char *strt, char *end));
int onintr __P((void));
int hash __P((char *strtp, char *endp));
int storeh __P((int num, char *strtp));
char *xfile;
FILE *xptr;
- if(signal(SIGHUP,onintr)==SIG_IGN)
+ if(signal(SIGHUP,(void (*) __P((int sig)))onintr)==SIG_IGN)
signal(SIGHUP,SIG_IGN);
- if(signal(SIGINT,onintr)==SIG_IGN)
+ if(signal(SIGINT,(void (*) __P((int sig)))onintr)==SIG_IGN)
signal(SIGINT,SIG_IGN);
- signal(SIGPIPE,onintr);
- signal(SIGTERM,onintr);
+ signal(SIGPIPE,(void (*) __P((int sig)))onintr);
+ signal(SIGTERM,(void (*) __P((int sig)))onintr);
/* argument decoding */
if((strtbufp = calloc(N,BUFSIZ)) == NULL)
diag("Out of memory space",empty);
bufp = strtbufp;
- endbufp = strtbufp+MAX;
+ endbufp = strtbufp+_MAX;
if((xptr = fopen(xfile,"r")) == NULL)
diag("Cannot open file",xfile);
exit(0);
}
-int msg(s, arg) char *s; char *arg; {
+void msg(s, arg) char *s; char *arg; {
fprintf(stderr,"%s %s\n",s,arg);
return;
}
return(0);
}
-int cmpline(pend) char *pend; {
+void cmpline(pend) char *pend; {
char *pstrt, *pchar, *cp;
char **hp;
return(0);
}
-int putline(strt, end) char *strt; char *end; {
+void putline(strt, end) char *strt; char *end; {
char *cp;
for(cp=strt; cp<end; cp++)
putc('\n',sortptr);
}
-int getsort() {
+void getsort() {
register c;
register char *tilde, *linep, *ref;
char *p1a,*p1b,*p2a,*p2b,*p3a,*p3b,*p4a,*p4b;
return(a);
}
-int putout(strt, end) char *strt; char *end; {
+void putout(strt, end) char *strt; char *end; {
char *cp;
cp = strt;
char stab[STRTABSZ];
} strbase, *pstrseg;
+#ifdef X_
+#define N_NAME(x) (strtab + (x).n_un.n_strx)
+#else
+#define N_NAME(x) ((x).n_un.n_name)
+#endif
+
#ifndef __P
#ifdef __STDC__
#define __P(args) args
char *segalloc __P((unsigned size));
void segclean __P((void));
int fixsize __P((void));
-int fixdate __P((char *s));
+void fixdate __P((char *s));
int main(argc, argv) int argc; char **argv; {
char cmdbuf[BUFSIZ];
fread((char *)&sym, 1, sizeof(sym), fi);
if (sym.n_un.n_strx == 0)
continue;
+#ifndef X_
sym.n_un.n_name = strtab + sym.n_un.n_strx;
+#endif
if ((sym.n_type&N_EXT)==0)
continue;
switch (sym.n_type&N_TYPE) {
void stash(s) struct nlist *s; {
register char *cp;
- register char *strtab;
+ register char *_strtab;
register strsiz;
register struct ranlib *tab;
register tabsiz;
pstrseg->nelem = 0;
}
strsiz = pstrseg->nelem;
- strtab = pstrseg->stab;
+ _strtab = pstrseg->stab;
tab[tabsiz].ran_un.ran_strx = tssiz;
tab[tabsiz].ran_off = oldoff;
redo:
- for (cp = s->n_un.n_name; strtab[strsiz++] = *cp++;)
+ for (cp = N_NAME(*s); _strtab[strsiz++] = *cp++;)
if (strsiz >= STRTABSZ) {
/* allocate a new string table segment */
pstrseg = pstrseg->pnext =
(struct strsegment *) segalloc(sizeof(struct strsegment));
pstrseg->pnext = NULL;
strsiz = pstrseg->nelem = 0;
- strtab = pstrseg->stab;
+ _strtab = pstrseg->stab;
goto redo;
}
}
/* patch time */
-int fixdate(s) char *s; {
+void fixdate(s) char *s; {
long time();
char buf[24];
int fd;
char line[N];
FILE *input;
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
register i,c;
input = stdin;
do {
#if defined(DOSCCS) && !defined(lint)
static char *sccsid = "@(#)sleep.c 4.1 (Berkeley) 10/1/80";
#endif
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
int c, n;
char *s;
int *lspace;
char *tspace;
/*int cmp(), cmpa();*/
-int (*compare)() = cmpa;
+/*int (*compare)() = cmpa;*/
/*char *eol();*/
/*int term();*/
int mflg;
zero+128,
0,
1,
- 0,0,
- 0,-1,
- 0,0
+ {0,0},
+ {0,-1},
+ {0,0}
};
int nfields;
int error = 1;
#endif
#endif
-int main __P((int argc, char **argv));
-int sort __P((void));
-int merge __P((int a, int b));
-int disorder __P((char *s, char *t));
-int newfile __P((void));
+void main __P((int argc, char **argv));
+void sort __P((void));
+void merge __P((int a, int b));
+void disorder __P((char *s, char *t));
+void newfile __P((void));
char *setfil __P((int i));
-int oldfile __P((void));
-int safeoutfil __P((void));
-int cant __P((char *f));
-int diag __P((char *s, char *t));
-int term __P((void));
+void oldfile __P((void));
+void safeoutfil __P((void));
+void cant __P((char *f));
+void diag __P((char *s, char *t));
+void term __P((void));
int cmp __P((char *i, char *j));
int cmpa __P((register char *pa, register char *pb));
char *skip __P((char *pp, struct field *fp, int j));
char *eol __P((register char *p));
-int copyproto __P((void));
-int field __P((char *s, int k));
+void copyproto __P((void));
+void field __P((char *s, int k));
int number __P((char **ppa));
-int _qsort __P((char **a, char **l));
+void _qsort __P((char **a, char **l));
-int main(argc, argv) int argc; char **argv; {
+int (*compare) __P((char *pa, char *pb)) = cmpa;
+
+void main(argc, argv) int argc; char **argv; {
register a;
/*extern char end[1];*/
char *ep;
/*ep = end + MEM;*/
lspace = (int *)sbrk(0);
ep = (char *)lspace + MEM;
- while((int)brk(ep) == -1)
+ while(brk(ep))
ep -= 512;
#ifndef vax
brk(ep -= 512); /* for recursion */
close(a);
unlink(file);
if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
- signal(SIGHUP, term);
+ signal(SIGHUP, (void (*) __P((int sig)))term);
if (signal(SIGINT, SIG_IGN) != SIG_IGN)
- signal(SIGINT, term);
- signal(SIGPIPE,term);
+ signal(SIGINT, (void (*) __P((int sig)))term);
+ signal(SIGPIPE,(void (*) __P((int sig)))term);
if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
- signal(SIGTERM,term);
+ signal(SIGTERM,(void (*) __P((int sig)))term);
nfiles = eargc;
if(!mflg && !cflg) {
sort();
term();
}
-int sort() {
+void sort() {
register char *cp;
register char **lp;
register lines, text, len;
FILE *b;
} *ibuf[256];
-int merge(a, b) int a; int b; {
+void merge(a, b) int a; int b; {
struct merg *p;
register char *cp, *dp;
register i;
fclose(os);
}
-int disorder(s, t) char *s; char *t; {
+void disorder(s, t) char *s; char *t; {
register char *u;
for(u=t; *u!='\n';u++) ;
*u = 0;
term();
}
-int newfile() {
+void newfile() {
register char *f;
f = setfil(nfiles);
return(file);
}
-int oldfile() {
+void oldfile() {
if(outfil) {
if((os=fopen(outfil, "w")) == NULL) {
os = stdout;
}
-int safeoutfil() {
+void safeoutfil() {
register int i;
struct stat obuf,ibuf;
}
}
-int cant(f) char *f; {
+void cant(f) char *f; {
perror(f);
term();
}
-int diag(s, t) char *s; char *t; {
+void diag(s, t) char *s; char *t; {
fputs("sort: ",stderr);
fputs(s,stderr);
fputs(t,stderr);
fputs("\n",stderr);
}
-int term() {
+void term() {
register i;
signal(SIGINT, SIG_IGN);
return(p);
}
-int copyproto() {
+void copyproto() {
register i;
register int *p, *q;
*q++ = *p++;
}
-int field(s, k) char *s; int k; {
+void field(s, k) char *s; int k; {
register struct field *p;
register d;
p = &fields[nfields];
#define qsexc(p,q) t= *p;*p= *q;*q=t
#define qstexc(p,q,r) t= *p;*p= *r;*r= *q;*q=t
-int _qsort(a, l) char **a; char **l; {
+void _qsort(a, l) char **a; char **l; {
register char **i, **j;
char **k;
char **lp, **hp;
float rhs __P((int i));
int spline __P((void));
-int readin __P((void));
+void readin __P((void));
int getfloat __P((float *p));
-int getlim __P((struct proj *p));
-int main __P((int argc, char *argv[]));
+void getlim __P((struct proj *p));
+void main __P((int argc, char *argv[]));
int numb __P((float *np, int *argcp, char ***argvp));
float rhs(i) int i; {
}
return(1);
}
-int readin() {
+void readin() {
for(n=0;n<NP;n++){
if(auta) x.val[n] = n*dx+x.lb;
else if(!getfloat(&x.val[n])) break;
*p = atof(buf);
return(1); }
-int getlim(p) struct proj *p; {
+void getlim(p) struct proj *p; {
int i;
for(i=0;i<n;i++) {
if(!p->lbf && p->lb>(p->val[i])) p->lb = p->val[i];
if(!p->ubf && p->ub<(p->val[i])) p->ub = p->val[i]; }
}
-int main(argc, argv) int argc; char *argv[]; {
+void main(argc, argv) int argc; char *argv[]; {
extern void *malloc();
int i;
x.lbf = x.ubf = y.lbf = y.ubf = 0;
#endif
int syslook __P((char *w));
-int main __P((int argc, char **argv));
-int clear __P((int n));
-int delay __P((int n));
-int tabs __P((int n));
-int margin __P((int n));
-int escape __P((int c));
-int bs __P((int n));
-int nl __P((void));
-int dasi450 __P((void));
-int tty37 __P((void));
-int dasi300 __P((void));
-int tn300 __P((void));
-int hp2645 __P((void));
-int misc __P((void));
+void main __P((int argc, char **argv));
+void clear __P((int n));
+void delay __P((int n));
+void tabs __P((int n));
+void margin __P((int n));
+void escape __P((int c));
+void bs __P((int n));
+void nl __P((void));
+void dasi450 __P((void));
+void tty37 __P((void));
+void dasi300 __P((void));
+void tn300 __P((void));
+void hp2645 __P((void));
+void misc __P((void));
int syslook(w) char *w; {
register struct sysnod *sp;
return(0);
}
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
struct sgttyb tb;
int type;
char *getenv();
}
}
-int clear(n) int n; {
+void clear(n) int n; {
escape(CLR);
delay(n);
putchar(CR); nl();
}
-int delay(n) int n; {
+void delay(n) int n; {
while (n--) putchar(DEL);
}
-int tabs(n) int n; {
+void tabs(n) int n; {
int i,j;
if(margset) n--;
}
}
-int margin(n) int n; {
+void margin(n) int n; {
int i;
if(margset) {
}
}
-int escape(c) int c; {
+void escape(c) int c; {
putchar(ESC); putchar(c);
}
-int bs(n) int n; {
+void bs(n) int n; {
while (n--) putchar(BS);
}
-int nl() {
+void nl() {
putchar(NL);
}
/* ======== terminal types ======== */
-int dasi450() {
+void dasi450() {
struct sgttyb t;
gtty(0,&t);
t.sg_flags &= ~ALLDELAY;
escape(RHM); nl();
}
-int tty37() {
+void tty37() {
putchar(SI); clear(40); bs(8); tabs(9); nl();
}
-int dasi300() {
+void dasi300() {
clear(8); tabs(15); nl();
}
-int tn300() {
+void tn300() {
struct sgttyb t;
gtty(0,&t);
t.sg_flags &= ~ALLDELAY;
clear(8); margin(8); escape(SET); tabs(14); nl();
}
-int hp2645() {
+void hp2645() {
escape('3'); /*clr*/
putchar(CR);
tabs(10);
nl();
}
-int misc() {
+void misc() {
tabs(14); nl();
}
/*#include <signal.h>*/
/*#include <stdio.h>*/
-#define oput(c) if (pgskip==0) putchar(c); else (c);
+#define oput(c) if (pgskip==0) putchar(c);
#define MAXY 3071
#define US 037
#define GS 035
extern char *asctab[128];
extern char *spectab[128];
int erase = 1;
-int (*sigint)();
-int (*sigquit)();
+void (*sigint) __P((int sig));
+void (*sigquit) __P((int sig));
#ifndef __P
#ifdef __STDC__
#endif
#endif
-int main __P((int argc, char **argv));
-int lig __P((char *x));
-int init __P((void));
-int ex __P((void));
-int kwait __P((void));
-int callunix __P((char line[]));
+void main __P((int argc, char **argv));
+void lig __P((char *x));
+void init __P((void));
+void ex __P((void));
+void kwait __P((void));
+void callunix __P((char line[]));
int readch __P((void));
-int sendpt __P((void));
+void sendpt __P((void));
int _atoi __P((void));
long tscale __P((int n));
int getch __P((void));
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
register i, j;
register char *k;
- extern ex();
+ extern void ex();
while((--argc > 0) && ((++argv)[0][0]=='-')){
switch(argv[0][1]){
exit(1);
}
}
- sigint = signal(SIGINT, ex);
+ sigint = signal(SIGINT, (void (*) __P((int sig)))ex);
sigquit = signal(SIGQUIT, SIG_IGN);
while((i = getchar()) != EOF){
if(!i)continue;
}
ex();
}
-int lig(x) char *x; {
+void lig(x) char *x; {
register i, j;
register char *k;
xx -= j;
sendpt();
}
-int init() {
+void init() {
fflush(stdout);
if(erase){
skip = 0;
sendpt();
}
-int ex() {
+void ex() {
yy = MAXY;
xx = 0;
sendpt();
fflush(stdout);
exit(0);
}
-int kwait() {
+void kwait() {
char buf[128]; char *bptr; char c;
if(pgskip) return;
next:
else if (c==0) ex();
else return;
}
-int callunix(line) char line[]; {
+void callunix(line) char line[]; {
int rc, status, unixpid;
if( (unixpid=fork())==0 ) {
signal(SIGINT,sigint); signal(SIGQUIT,sigquit);
return;
else{ signal(SIGINT, SIG_IGN); signal(SIGQUIT, SIG_IGN);
while( (rc = wait(&status)) != unixpid && rc != -1 ) ;
- signal(SIGINT,ex); signal(SIGQUIT,sigquit);
+ signal(SIGINT,(void (*) __P((int sig)))ex); signal(SIGQUIT,sigquit);
}
}
int readch() {
if (read(2,&c,1)<1) c=0;
return(c);
}
-int sendpt() {
+void sendpt() {
int hy,xb,ly,hx,lx;
oput(GS);
#endif
#endif
-int main __P((int argc, char **argv));
-int init __P((void));
-int ex __P((void));
-int kwait __P((void));
-int execom __P((void));
-int sendpt __P((int a));
+void main __P((int argc, char **argv));
+void init __P((void));
+void ex __P((void));
+void kwait __P((void));
+void execom __P((void));
+void sendpt __P((int a));
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
register i, j;
- extern ex();
+ extern void ex();
while (--argc > 0 && (++argv)[0][0]=='-')
switch(argv[0][1]) {
exit(1);
}
}
- signal(SIGINT, ex);
+ signal(SIGINT, (void (*) __P((int sig)))ex);
ncol = maxcol;
init();
while ((i = getchar()) != EOF) {
ex();
}
-int init() {
+void init() {
ohx = oxb = olx = ohy = oly = -1;
if (ncol >= maxcol) {
ncol = 0;
sendpt(0);
}
-int ex() {
+void ex() {
yy = MAXY;
xx = 0;
fputs("\033;\037", stdout);
exit(0);
}
-int kwait() {
+void kwait() {
register c;
fflush(stdout);
}
}
-int execom() {
- int (*si)(), (*sq)();
+void execom() {
+ void (*si) __P((int sig)), (*sq) __P((int sig));
if (fork() != 0) {
si = signal(SIGINT, SIG_IGN);
execl("/bin/sh", "sh", "-t", 0);
}
-int sendpt(a) int a; {
+void sendpt(a) int a; {
register zz;
int hy,xb,ly,hx,lx;
#endif
#endif
-int main __P((int argc, char **argv));
-int touch __P((char *filename));
-int readwrite __P((char *filename, int size));
+void main __P((int argc, char **argv));
+void touch __P((char *filename));
+void readwrite __P((char *filename, int size));
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
char *argp;
dontcreate = 0;
}
}
-int touch(filename) char *filename; {
+void touch(filename) char *filename; {
struct stat statbuffer;
if (stat(filename,&statbuffer) == -1) {
}
}
-int readwrite(filename, size) char *filename; int size; {
+void readwrite(filename, size) char *filename; int size; {
int filedescriptor;
char first;
#endif
#endif
-int main __P((int argc, char **argv));
+void main __P((int argc, char **argv));
int present __P((struct nodelist *i, struct nodelist *j));
int anypred __P((struct nodelist *i));
struct nodelist *_index __P((register char *s));
int cmp __P((register char *s, register char *t));
int error __P((char *s, char *t));
-int note __P((char *s, char *t));
+void note __P((char *s, char *t));
struct nodelist *findloop __P((void));
struct nodelist *mark __P((register struct nodelist *i));
-int main(argc, argv) int argc; char **argv; {
+void main(argc, argv) int argc; char **argv; {
register struct predlist *t;
FILE *input = stdin;
register struct nodelist *i, *j;
exit(1);
}
-int note(s, t) char *s; char *t; {
+void note(s, t) char *s; char *t; {
fprintf(stderr,"tsort: %s%s\n",s,t);
}
int main __P((int argc, char *argv[]));
int gline __P((register char buf[]));
-int pline __P((register char buf[]));
+void pline __P((register char buf[]));
int equal __P((register char b1[], register char b2[]));
char *skip __P((register char *s));
int printe __P((char *p, char *s));
return(0);
}
-int pline(buf) register char buf[]; {
+void pline(buf) register char buf[]; {
switch(mode) {
};
struct table {
- double factor;
- char dim[NDIM];
+ struct unit unit;
char *name;
} table[NTAB];
char names[NTAB*10];
double factor;
char *pname;
} prefix[] = {
- 1e-18, "atto",
- 1e-15, "femto",
- 1e-12, "pico",
- 1e-9, "nano",
- 1e-6, "micro",
- 1e-3, "milli",
- 1e-2, "centi",
- 1e-1, "deci",
- 1e1, "deka",
- 1e2, "hecta",
- 1e2, "hecto",
- 1e3, "kilo",
- 1e6, "mega",
- 1e6, "meg",
- 1e9, "giga",
- 1e12, "tera",
- 0.0, 0
+ {1e-18, "atto"},
+ {1e-15, "femto"},
+ {1e-12, "pico"},
+ {1e-9, "nano"},
+ {1e-6, "micro"},
+ {1e-3, "milli"},
+ {1e-2, "centi"},
+ {1e-1, "deci"},
+ {1e1, "deka"},
+ {1e2, "hecta"},
+ {1e2, "hecto"},
+ {1e3, "kilo"},
+ {1e6, "mega"},
+ {1e6, "meg"},
+ {1e9, "giga"},
+ {1e12, "tera"},
+ {0.0, 0}
};
FILE *inp;
int fperrc;
#endif
int main __P((int argc, char *argv[]));
-int units __P((struct unit *up));
+void units __P((struct unit *up));
int pu __P((int u, int i, int f));
int convr __P((struct unit *up));
int lookup __P((char *name, struct unit *up, int den, int c));
int equal __P((char *s1, char *s2));
-int init __P((void));
+void init __P((void));
double getflt __P((void));
int get __P((void));
struct table *hash __P((char *name));
-int fperr __P((void));
+void fperr __P((void));
int main(argc, argv) int argc; char *argv[]; {
register i;
printf("no table\n");
exit(1);
}
- signal(8, fperr);
+ signal(SIGFPE, (void (*) __P((int sig)))fperr);
init();
loop:
goto loop;
}
-int units(up) struct unit *up; {
+void units(up) struct unit *up; {
register struct unit *p;
register f, i;
if(q->name) {
l1:
if(den) {
- p->factor /= q->factor*e;
+ p->factor /= q->unit.factor*e;
for(i=0; i<NDIM; i++)
- p->dim[i] -= q->dim[i];
+ p->dim[i] -= q->unit.dim[i];
} else {
- p->factor *= q->factor*e;
+ p->factor *= q->unit.factor*e;
for(i=0; i<NDIM; i++)
- p->dim[i] += q->dim[i];
+ p->dim[i] += q->unit.dim[i];
}
if(c >= '2' && c <= '9') {
c--;
return(0);
}
-int init() {
+void init() {
register char *cp;
register struct table *tp, *lp;
int c, i, f, t;
*cp++ = 0;
lp = hash(np);
lp->name = np;
- lp->factor = 1.0;
- lp->dim[i] = 1;
+ lp->unit.factor = 1.0;
+ lp->unit.dim[i] = 1;
}
lp = hash("");
lp->name = cp-1;
- lp->factor = 1.0;
+ lp->unit.factor = 1.0;
l0:
c = get();
if(tp->name == 0)
continue;
printf("%s", tp->name);
- units(tp);
+ units(&tp->unit);
}
fclose(inp);
inp = stdin;
if(tp->name)
goto redef;
tp->name = np;
- tp->factor = lp->factor;
+ tp->unit.factor = lp->unit.factor;
for(c=0; c<NDIM; c++)
- tp->dim[c] = lp->dim[c];
+ tp->unit.dim[c] = lp->unit.dim[c];
i++;
goto l0;
}
lp = hash(np);
if(lp->name)
goto redef;
- convr(lp);
+ convr(&lp->unit);
lp->name = np;
f = 0;
i++;
- if(lp->factor != 1.0)
+ if(lp->unit.factor != 1.0)
goto l0;
for(c=0; c<NDIM; c++) {
- t = lp->dim[c];
+ t = lp->unit.dim[c];
if(t>1 || (f>0 && t!=0))
goto l0;
if(f==0 && t==1) {
goto l0;
}
-int fperr() {
+void fperr() {
- signal(8, fperr);
+ signal(SIGFPE, (void (*) __P((int sig)))fperr);
fperrc++;
}
public / 43bsd.git / commitdiff