Added all single-source programs to cmds.json, fix linking problem. Still doesn't work: missing some dropped libraries (libsec, etc)

sys/src/cmd/aan.c

@@ -93,7 +93,7 @@ usage(void)
 }
 
 static int
-catch(void *, char *s)
+catch(void *v, char *s)
 {
 	if (strstr(s, "alarm") != nil) {
 		syslog(0, Logname, "Timed out waiting for client on %s, exiting...",
@@ -107,9 +107,9 @@ void
 threadmain(int argc, char **argv)
 {
 	int i, fd, failed, delta;
-	vlong synctime, now;
+	int64_t synctime, now;
 	char *p;
-	uchar buf[Hdrsz];
+	unsigned char buf[Hdrsz];
 	Buf *b, *eb;
 	Channel *timer;
 	Hdr hdr;
@@ -150,7 +150,7 @@ threadmain(int argc, char **argv)
 	unsent = chancreate(sizeof(Buf *), Nbuf);
 	unacked= chancreate(sizeof(Buf *), Nbuf);
 	empty  = chancreate(sizeof(Buf *), Nbuf);
-	timer  = chancreate(sizeof(uchar *), 1);
+	timer  = chancreate(sizeof(unsigned char *), 1);
 
 	for (i = 0; i != Nbuf; i++) {
 		eb = malloc(sizeof(Buf));
@@ -232,7 +232,7 @@ threadmain(int argc, char **argv)
 }
 
 static void
-fromclient(void*)
+fromclient(void *v)
 {
 	Buf *b;
 	static int outmsg;
@@ -254,7 +254,7 @@ fromclient(void*)
 }
 
 static void
-fromnet(void*)
+fromnet(void *v)
 {
 	int len, acked, i;
 	uint8_t buf[Hdrsz];
@@ -501,7 +501,7 @@ freeendpoints(Endpoints *ep)
 	free(ep);
 }
 
-/* p must be a uchar* */
+/* p must be a unsigned char* */
 #define	U32GET(p)	(p[0] | p[1]<<8 | p[2]<<16 | p[3]<<24)
 #define	U32PUT(p,v)	(p)[0] = (v); (p)[1] = (v)>>8; \
 			(p)[2] = (v)>>16; (p)[3] = (v)>>24

sys/src/cmd/ar.c

@@ -117,7 +117,7 @@ int	duplicate(char*);
 Armember *getdir(Biobuf*);
 int	getspace(void);
 void	install(char*, Arfile*, Arfile*, Arfile*, int);
-void	longt(Armember*);
+void	int32_tt(Armember*);
 int	match(int, char**);
 void	mesg(int, char*);
 Arfile	*newtempfile(char*);
@@ -131,7 +131,7 @@ void	scanobj(Biobuf*, Arfile*, int32_t);
 void	select(int*, int32_t);
 void	setcom(void(*)(char*, int, char**));
 void	skip(Biobuf*, int64_t);
-int	symcomp(void*, void*);
+int	symcomp(void *c, void*);
 void	trim(char*, char*, int);
 void	usage(void);
 void	wrerr(void);
@@ -469,7 +469,7 @@ tcmd(char *arname, int count, char **files)
 	while(bp = getdir(&bar)) {
 		if(count == 0 || match(count, files)) {
 			if(vflag)
-				longt(bp);
+				int32_tt(bp);
 			trim(file, name, ARNAMESIZE);
 			Bprint(&bout, "%s\n", name);
 		}
@@ -976,7 +976,7 @@ trim(char *s, char *buf, int n)
 }
 
 /*
- *	utilities for printing long form of 't' command
+ *	utilities for printing int32_t form of 't' command
  */
 #define	SUID	04000
 #define	SGID	02000
@@ -992,7 +992,7 @@ trim(char *s, char *buf, int n)
 #define	STXT	01000
 
 void
-longt(Armember *bp)
+int32_tt(Armember *bp)
 {
 	char *cp;
 

sys/src/cmd/archfs.c

@@ -25,7 +25,7 @@ int verbose;
 
 typedef struct Ahdr Ahdr;
 struct Ahdr {
-	char *name;
+	char *_name;
 	Dir;
 };
 
@@ -86,7 +86,7 @@ gethdr(Biobuf *b)
 	}
 
 	a = emalloc(sizeof(*a));
-	a->name = estrdup(f[0]);
+	a->_name = estrdup(f[0]);
 	a->mode = strtoul(f[1], 0, 8);
 	a->uid = estrdup(f[2]);
 	a->gid = estrdup(f[3]);
@@ -199,7 +199,7 @@ void
 main(int argc, char **argv)
 {
 	Ahdr *a;
-	ulong flag;
+	uint32_t flag;
 	char *mtpt;
 	char err[ERRMAX];
 
@@ -237,7 +237,7 @@ main(int argc, char **argv)
 
 	archtree = fs.tree = alloctree("sys", "sys", DMDIR|0775, nil);
 	while(a = gethdr(b)) {
-		archcreatefile(a->name, newarch(Boffset(b), a->length), a);
+		archcreatefile(a->_name, newarch(Boffset(b), a->length), a);
 		Bseek(b, a->length, 1);
 	}
 

sys/src/cmd/bsplit.c

@@ -173,7 +173,7 @@ void
 main(int argc, char **argv)
 {
 	int i, errflg = 0;
-	uchar block[Bufsiz];
+	unsigned char block[Bufsiz];
 
 	cp.prefix = "bs.";
 	ARGBEGIN {

sys/src/cmd/cal.c

@@ -73,7 +73,7 @@ main(int argc, char *argv[])
 			y = curyr();
 			goto xshort;
 		}
-		goto xlong;
+		goto xint32_t;
 	}
 
 /*
@@ -103,7 +103,7 @@ xshort:
 /*
  *	print out complete year
  */
-xlong:
+xint32_t:
 	y = number(argv[1]);
 	if(y<1 || y>9999)
 		goto badarg;

sys/src/cmd/calendar.c

@@ -42,7 +42,7 @@ void
 main(int argc, char *argv[])
 {
 	int i, fd, ahead;
-	long now;
+	int32_t now;
 	char *line;
 	Tm *tm;
 	Date *d;

sys/src/cmd/calls.c

@@ -138,7 +138,7 @@ char *dashes;				/* separators for deep nestings */
  */
 char *sysword[] = {
 	"auto", "case", "char", "do", "double", "else", "enum",
-	"extern", "float", "for", "if", "int", "long", "register",
+	"extern", "float", "for", "if", "int", "int32_t", "register",
 	"return", "short", "sizeof", "static", "struct", "switch",
 	"typedef", "union", "unsigned", "void", "while",
 };
@@ -640,7 +640,7 @@ getfunc(Biobuf *in, char *atom)
 			} while(ap < ep && ISIDENT(c));
 			*ap = '\0';
 			if (ap >= ep) {	/* uncommon case: id won't fit */
-				/* consume remainder of too-long id */
+				/* consume remainder of too-int32_t id */
 				while (ISIDENT(c))
 					c = nextc(in);
 			}
@@ -932,7 +932,7 @@ main(int argc, char **argv)
 
 	if (Printstats) {
 		fprint(2, "%ld/%d aseen entries\n", stats.highestseen, Maxseen);
-		fprint(2, "%ld longest namelist hash chain\n", stats.highestname);
+		fprint(2, "%ld int32_test namelist hash chain\n", stats.highestname);
 		fprint(2, "%ld/%d activelist high water mark\n",
 			stats.highestact, Maxdepth);
 		fprint(2, "%ld dlist high water mark\n", stats.highgetfree);

sys/src/cmd/clock.c

@@ -72,7 +72,7 @@ eresized(int new)
 }
 
 void
-main(int, char**)
+main(int i, char **c)
 {
 	Event e;
 	Mouse m;

sys/src/cmd/cmd.json

@@ -9,6 +9,7 @@
 	"-fplan9-extensions",
 	"-ffreestanding",
 	"-fno-builtin",
+	"-trigraphs",
 	"-Wall",
 	"-Wno-missing-braces",
 	"-Wno-parentheses",
@@ -19,18 +20,43 @@
     ],
     "Oflags": [
 	"-static",
-	"-e_main"
+	"-e_main",
+	"-L../../../amd64/lib",
+	"-l9p",
+	"-lauth",
+	"-lauthsrv",
+	"-lavl",
+	"-lbin",
+	"-lbio",
+	"-lcomplete",
+	"-lcontrol",
+	"-ldisk",
+	"-ldraw",
+	"-lflate",
+	"-lframe",
+	"-lgeometry",
+	"-lhtml",
+	"-lhttpd",
+	"-lip",
+	"-ll",
+	"-llex",
+	"-lmach",
+	"-lmemdraw",
+	"-lmemlayer",
+	"-lmp",
+	"-lndb",
+	"-lplumb",
+	"-lregexp",
+	"-lstdio",
+	"-lString",
+	"-lsunrpc",
+	"-lthread",
+	"-lventi",
+	"-lc"
     ],
     "Post": [
 	"rm *.o"
     ],
     "Libs": [
-	"/amd64/lib/libString.a",
-	"/amd64/lib/lib9p.a",
-	"/amd64/lib/libndb.a",
-	"/amd64/lib/libauth.a",
-	"/amd64/lib/libbio.a",
-	"/amd64/lib/libip.a",
-	"/amd64/lib/libc.a"
     ]
 }

sys/src/cmd/cmds.json

@@ -1,39 +1,372 @@
 {
 	"Name": "Cmds",
 	"Programs": [
+	"aan",
+	"archfs",
+	"ascii",
+	"awd",
+	"basename",
+	"bsplit",
+	"cal",
+	"calendar",
+	"calls",
 	"cat",
+	"chgrp",
+	"chmod",
+	"cleanname",
+	"clock",
+	"cmp",
+	"col",
+	"colors",
+	"comm",
 	"cp",
-	"ls",
-	"ps",
+	"cpu",
+	"crop",
+	"dc",
+	"dd",
+	"deroff",
+	"du",
+	"ecp",
+	"ed",
+	"factor",
+	"fcp",
+	"file",
+	"fmt",
+	"fortune",
+	"freq",
+	"getmap",
+	"gview",
+	"hget",
+	"histogram",
+	"history",
+	"html2ms",
+	"iconv",
+	"idiff",
+	"import",
+	"init",
+	"join",
+	"kbmap",
+	"kprof",
+	"ktrace",
+	"lens",
+	"lnfs",
+	"lock",
+	"look",
+	"mc",
+	"md5sum",
 	"mkdir",
+	"mntgen",
+	"ms2html",
+	"mtime",
+	"mug",
+	"mv",
+	"netstat",
+	"news",
+	"nfs",
+	"nm",
+	"nntpfs",
+	"ns",
+	"pbd",
+	"p",
+	"pcc",
+	"pipefile",
+	"pr",
+	"primes",
+	"prof",
+	"ps",
+	"pump",
 	"pwd",
-	"chmod",
-	"date",
-	"dd"
+	"ramfs",
+	"ratrace",
+	"rdbfs",
+	"read",
+	"resample",
+	"rm",
+	"rx",
+	"screenlock",
+	"seconds",
+	"sed",
+	"seq",
+	"sha1sum",
+	"size",
+	"sleep",
+	"sort",
+	"split",
+	"srvfs",
+	"stats",
+	"strings",
+	"strip",
+	"sum",
+	"swap",
+	"tail",
+	"tar",
+	"tee",
+	"testalarm",
+	"test",
+	"time",
+	"tlsclient",
+	"tlssrv",
+	"touch",
+	"tprof",
+	"trace",
+	"tr",
+	"tweak",
+	"unicode",
+	"uniq",
+	"unlnfs",
+	"unmount",
+	"wc",
+	"webcookies",
+	"webfsget",
+	"winwatch",
+	"xd",
+	"yacc"
 	],
 	"Include": ["cmd.json"],
 	"Pre": [
 	],
 	"SourceFilesCmd": [
+	"aan.c",
+	"archfs.c",
+	"ascii.c",
+	"awd.c",
+	"basename.c",
+	"bsplit.c",
+	"cal.c",
+	"calendar.c",
+	"calls.c",
 	"cat.c",
+	"chgrp.c",
+	"chmod.c",
+	"cleanname.c",
+	"clock.c",
+	"cmp.c",
+	"col.c",
+	"colors.c",
+	"comm.c",
 	"cp.c",
-	"ls.c",
-	"ps.c",
+	"cpu.c",
+	"crop.c",
+	"dc.c",
+	"dd.c",
+	"deroff.c",
+	"du.c",
+	"ecp.c",
+	"ed.c",
+	"factor.c",
+	"fcp.c",
+	"file.c",
+	"fmt.c",
+	"fortune.c",
+	"freq.c",
+	"getmap.c",
+	"gview.c",
+	"hget.c",
+	"histogram.c",
+	"history.c",
+	"html2ms.c",
+	"iconv.c",
+	"idiff.c",
+	"import.c",
+	"init.c",
+	"join.c",
+	"kbmap.c",
+	"kprof.c",
+	"ktrace.c",
+	"lens.c",
+	"lnfs.c",
+	"lock.c",
+	"look.c",
+	"mc.c",
+	"md5sum.c",
 	"mkdir.c",
+	"mntgen.c",
+	"ms2html.c",
+	"mtime.c",
+	"mug.c",
+	"mv.c",
+	"netstat.c",
+	"news.c",
+	"nfs.c",
+	"nm.c",
+	"nntpfs.c",
+	"ns.c",
+	"pbd.c",
+	"p.c",
+	"pcc.c",
+	"pipefile.c",
+	"pr.c",
+	"primes.c",
+	"prof.c",
+	"ps.c",
+	"pump.c",
 	"pwd.c",
-	"chmod.c",
-	"date.c",
-	"dd.c"
+	"ramfs.c",
+	"ratrace.c",
+	"rdbfs.c",
+	"read.c",
+	"resample.c",
+	"rm.c",
+	"rx.c",
+	"screenlock.c",
+	"seconds.c",
+	"sed.c",
+	"seq.c",
+	"sha1sum.c",
+	"size.c",
+	"sleep.c",
+	"sort.c",
+	"split.c",
+	"srvfs.c",
+	"stats.c",
+	"strings.c",
+	"strip.c",
+	"sum.c",
+	"swap.c",
+	"tail.c",
+	"tar.c",
+	"tee.c",
+	"testalarm.c",
+	"test.c",
+	"time.c",
+	"tlsclient.c",
+	"tlssrv.c",
+	"touch.c",
+	"tprof.c",
+	"trace.c",
+	"tr.c",
+	"tweak.c",
+	"unicode.c",
+	"uniq.c",
+	"unlnfs.c",
+	"unmount.c",
+	"wc.c",
+	"webcookies.c",
+	"webfsget.c",
+	"winwatch.c",
+	"xd.c",
+	"yacc.c"
 	],
 	"Post": [
+	"mv aan ../../../amd64/bin/",
+	"mv archfs ../../../amd64/bin/",
+	"mv ascii ../../../amd64/bin/",
+	"mv awd ../../../amd64/bin/",
+	"mv basename ../../../amd64/bin/",
+	"mv bsplit ../../../amd64/bin/",
+	"mv cal ../../../amd64/bin/",
+	"mv calendar ../../../amd64/bin/",
+	"mv calls ../../../amd64/bin/",
 	"mv cat ../../../amd64/bin/",
+	"mv chgrp ../../../amd64/bin/",
+	"mv chmod ../../../amd64/bin/",
+	"mv cleanname ../../../amd64/bin/",
+	"mv clock ../../../amd64/bin/",
+	"mv cmp ../../../amd64/bin/",
+	"mv col ../../../amd64/bin/",
+	"mv colors ../../../amd64/bin/",
+	"mv comm ../../../amd64/bin/",
 	"mv cp ../../../amd64/bin/",
-	"mv ls ../../../amd64/bin/",
-	"mv ps ../../../amd64/bin/",
+	"mv cpu ../../../amd64/bin/",
+	"mv crop ../../../amd64/bin/",
+	"mv dc ../../../amd64/bin/",
+	"mv dd ../../../amd64/bin/",
+	"mv deroff ../../../amd64/bin/",
+	"mv du ../../../amd64/bin/",
+	"mv ecp ../../../amd64/bin/",
+	"mv ed ../../../amd64/bin/",
+	"mv factor ../../../amd64/bin/",
+	"mv fcp ../../../amd64/bin/",
+	"mv file ../../../amd64/bin/",
+	"mv fmt ../../../amd64/bin/",
+	"mv fortune ../../../amd64/bin/",
+	"mv freq ../../../amd64/bin/",
+	"mv getmap ../../../amd64/bin/",
+	"mv gview ../../../amd64/bin/",
+	"mv hget ../../../amd64/bin/",
+	"mv histogram ../../../amd64/bin/",
+	"mv history ../../../amd64/bin/",
+	"mv html2ms ../../../amd64/bin/",
+	"mv iconv ../../../amd64/bin/",
+	"mv idiff ../../../amd64/bin/",
+	"mv import ../../../amd64/bin/",
+	"mv init ../../../amd64/bin/",
+	"mv join ../../../amd64/bin/",
+	"mv kbmap ../../../amd64/bin/",
+	"mv kprof ../../../amd64/bin/",
+	"mv ktrace ../../../amd64/bin/",
+	"mv lens ../../../amd64/bin/",
+	"mv lnfs ../../../amd64/bin/",
+	"mv lock ../../../amd64/bin/",
+	"mv look ../../../amd64/bin/",
+	"mv mc ../../../amd64/bin/",
+	"mv md5sum ../../../amd64/bin/",
 	"mv mkdir ../../../amd64/bin/",
+	"mv mntgen ../../../amd64/bin/",
+	"mv ms2html ../../../amd64/bin/",
+	"mv mtime ../../../amd64/bin/",
+	"mv mug ../../../amd64/bin/",
+	"mv mv ../../../amd64/bin/",
+	"mv netstat ../../../amd64/bin/",
+	"mv news ../../../amd64/bin/",
+	"mv nfs ../../../amd64/bin/",
+	"mv nm ../../../amd64/bin/",
+	"mv nntpfs ../../../amd64/bin/",
+	"mv ns ../../../amd64/bin/",
+	"mv pbd ../../../amd64/bin/",
+	"mv p ../../../amd64/bin/",
+	"mv pcc ../../../amd64/bin/",
+	"mv pipefile ../../../amd64/bin/",
+	"mv pr ../../../amd64/bin/",
+	"mv primes ../../../amd64/bin/",
+	"mv prof ../../../amd64/bin/",
+	"mv ps ../../../amd64/bin/",
+	"mv pump ../../../amd64/bin/",
 	"mv pwd ../../../amd64/bin/",
-	"mv chmod ../../../amd64/bin/",
-	"mv date ../../../amd64/bin/",
-	"mv dd ../../../amd64/bin/"
+	"mv ramfs ../../../amd64/bin/",
+	"mv ratrace ../../../amd64/bin/",
+	"mv rdbfs ../../../amd64/bin/",
+	"mv read ../../../amd64/bin/",
+	"mv resample ../../../amd64/bin/",
+	"mv rm ../../../amd64/bin/",
+	"mv rx ../../../amd64/bin/",
+	"mv screenlock ../../../amd64/bin/",
+	"mv seconds ../../../amd64/bin/",
+	"mv sed ../../../amd64/bin/",
+	"mv seq ../../../amd64/bin/",
+	"mv sha1sum ../../../amd64/bin/",
+	"mv size ../../../amd64/bin/",
+	"mv sleep ../../../amd64/bin/",
+	"mv sort ../../../amd64/bin/",
+	"mv split ../../../amd64/bin/",
+	"mv srvfs ../../../amd64/bin/",
+	"mv stats ../../../amd64/bin/",
+	"mv strings ../../../amd64/bin/",
+	"mv strip ../../../amd64/bin/",
+	"mv sum ../../../amd64/bin/",
+	"mv swap ../../../amd64/bin/",
+	"mv tail ../../../amd64/bin/",
+	"mv tar ../../../amd64/bin/",
+	"mv tee ../../../amd64/bin/",
+	"mv testalarm ../../../amd64/bin/",
+	"mv test ../../../amd64/bin/",
+	"mv time ../../../amd64/bin/",
+	"mv tlsclient ../../../amd64/bin/",
+	"mv tlssrv ../../../amd64/bin/",
+	"mv touch ../../../amd64/bin/",
+	"mv tprof ../../../amd64/bin/",
+	"mv trace ../../../amd64/bin/",
+	"mv tr ../../../amd64/bin/",
+	"mv tweak ../../../amd64/bin/",
+	"mv unicode ../../../amd64/bin/",
+	"mv uniq ../../../amd64/bin/",
+	"mv unlnfs ../../../amd64/bin/",
+	"mv unmount ../../../amd64/bin/",
+	"mv wc ../../../amd64/bin/",
+	"mv webcookies ../../../amd64/bin/",
+	"mv webfsget ../../../amd64/bin/",
+	"mv winwatch ../../../amd64/bin/",
+	"mv xd ../../../amd64/bin/",
+	"mv yacc ../../../amd64/bin/"
 	]
 }

sys/src/cmd/cmp.c

@@ -41,12 +41,12 @@ void
 main(int argc, char *argv[])
 {
 	int n, i;
-	uchar *p, *q;
-	uchar buf1[BUF], buf2[BUF];
+	unsigned char *p, *q;
+	unsigned char buf1[BUF], buf2[BUF];
 	int f1, f2;
-	vlong nc = 1, l = 1;
+	int64_t nc = 1, l = 1;
 	char *name1, *name2;
-	uchar *b1s, *b1e, *b2s, *b2e;
+	unsigned char *b1s, *b1e, *b2s, *b2e;
 
 	ARGBEGIN{
 	case 's':	sflag = 1; break;

sys/src/cmd/col.c

@@ -49,7 +49,7 @@ void
 main(int argc, char **argv)
 {
 	int i, lno;
-	long ch;
+	int32_t ch;
 	Rune c;
 
 	ARGBEGIN{

sys/src/cmd/colors.c

@@ -93,7 +93,7 @@ main(int argc, char *argv[])
 	char buf[100];
 	char *fmt;
 	Image *dark;
-	ulong rgb;
+	uint32_t rgb;
 
 	ramp = 0;
 

sys/src/cmd/cpu.c

@@ -28,7 +28,7 @@ void	remoteside(int);
 void	fatal(int, char*, ...);
 void	lclnoteproc(int);
 void	rmtnoteproc(void);
-void	catcher(void*, char*);
+void	catcher(void *c, char*);
 void	usage(void);
 void	writestr(int, char*, char*, int);
 int	readstr(int, char*, int);
@@ -236,7 +236,7 @@ main(int argc, char **argv)
 	else
 		writestr(data, dat, "dir", 0);
 
-	/* start up a process to pass along notes */
+	/* start up a process to pass aint32_t notes */
 	lclnoteproc(data);
 
 	/* 
@@ -789,7 +789,7 @@ enum
 struct {
 	char	*name;
 	Qid	qid;
-	ulong	perm;
+	uint32_t	perm;
 } fstab[] =
 {
 	[Qdir]		{ ".",		{Qdir, 0, QTDIR},	DMDIR|0555	},
@@ -1128,7 +1128,7 @@ err:
 char 	notebuf[ERRMAX];
 
 void
-catcher(void*, char *text)
+catcher(void *v, char *text)
 {
 	int n;
 

sys/src/cmd/crop.c

@@ -100,8 +100,8 @@ main(int argc, char *argv[])
 	Point t;
 	Memimage *m, *new;
 	char *file;
-	ulong bg, cropval;
-	long dw;
+	uint32_t bg, cropval;
+	int32_t dw;
 
 	memimageinit();
 	mode = None;

sys/src/cmd/dc.c

@@ -1206,7 +1206,7 @@ init(int argc, char *argv[])
 			exits("open");
 		}
 	}
-/*	dummy = malloc(0);  /* prepare for garbage-collection */
+/*	dummy = malloc(0);  *//* prepare for garbage-collection */
 	scalptr = salloc(1);
 	sputc(scalptr,0);
 	basptr = salloc(1);
@@ -2163,7 +2163,7 @@ seekc(Blk *hptr, int n)
 		lbytes += nn - hptr->last;
 		if(n > longest)
 			longest = n;
-/*		free(hptr->beg); /**/
+/*		free(hptr->beg); */
 		p = realloc(hptr->beg, n);
 		if(p == 0) {
 /*			hptr->beg = realloc(hptr->beg, hptr->last-hptr->beg);
@@ -2208,7 +2208,7 @@ more(Blk *hptr)
 		longest = size;
 	lbytes += size/2;
 	lmore++;
-/*	free(hptr->beg);/**/
+/*	free(hptr->beg);*/
 	p = realloc(hptr->beg, size);
 
 	if(p == 0) {

sys/src/cmd/ecp.c

@@ -594,7 +594,7 @@ void
 main(int argc, char **argv)
 {
 	int errflg = 0, plsconfirm = No, plsverify = No;
-	long lval;
+	int32_t lval;
 	File src, dest;
 	Sdaddr sect;
 

sys/src/cmd/ed.c

@@ -112,7 +112,7 @@ void	join(void);
 void	move(int);
 void	newline(void);
 void	nonzero(void);
-void	notifyf(void*, char*);
+void	notifyf(void *c, char*);
 Rune*	place(Rune*, Rune*, Rune*);
 void	printcom(void);
 void	putchr(int);
@@ -130,6 +130,9 @@ void	setwide(void);
 void	squeeze(int);
 void	substitute(int);
 
+static Rune la[] = {'a'};
+static Rune lr[] = {'r'};
+
 void
 main(int argc, char *argv[])
 {
@@ -154,7 +157,7 @@ main(int argc, char *argv[])
 		p2 = savedfile;
 		while(*p2++ = *p1++)
 			;
-		globp = L"a";
+		globp = la;
 	} else
 	if(*argv) {
 		p1 = *argv;
@@ -162,7 +165,7 @@ main(int argc, char *argv[])
 		while(*p2++ = *p1++)
 			if(p2 >= &savedfile[sizeof(savedfile)])
 				p2--;
-		globp = L"r";
+		globp = lr;
 	}
 	zero = malloc((nlall+5)*sizeof(int*));
 	tfname = mktemp("/tmp/eXXXXX");

sys/src/cmd/fcp.c

@@ -243,7 +243,7 @@ nextoff(void)
 }
 
 void
-failure(void*, char *note)
+failure(void *v, char *note)
 {
 	if(strcmp(note, "failure") == 0)
 		_exits(nil);

sys/src/cmd/file.c

@@ -75,7 +75,7 @@ struct
 	"integer",	Fword,
 	"iota",		Lword,
 	"libc",		I2,
-	"long",		Cword,
+	"int32_t",		Cword,
 	"module",	Lword,
 	"real",		Fword,
 	"ref",		Lword,
@@ -1379,7 +1379,7 @@ isp9font(void)
 int
 getfontnum(uint8_t *cp, uint8_t **rp)
 {
-	while (WHITESPACE(*cp))		/* extract ulong delimited by whitespace */
+	while (WHITESPACE(*cp))		/* extract uint32_t delimited by whitespace */
 		cp++;
 	if (*cp < '0' || *cp > '9')
 		return 0;

sys/src/cmd/fmt.c

@@ -151,7 +151,7 @@ parseline(char *line, Word **words, int *nwordp)
 				return addword(words, nwordp, "", 0, -1, bol);
 			break;
 		}
-		/* how long is this word? */
+		/* how int32_t is this word? */
 		for(l=0; line[l]; l++)
 			if(line[l]==' ' || line[l]=='\t')
 				break;

sys/src/cmd/getmap.c

@@ -97,7 +97,7 @@ getcmap(int id, char *f, unsigned char *buf)
 	return 1;
 }
 
-/* replicate (from top) value in v (n bits) until it fills a ulong */
+/* replicate (from top) value in v (n bits) until it fills a uint32_t */
 uint32_t
 rep(uint32_t v, int n)
 {

sys/src/cmd/gview.c

@@ -15,7 +15,7 @@
 #include	<cursor.h>
 #include	<stdio.h>
 
-#define Never	0xffffffff	/* Maximum ulong */
+#define Never	0xffffffff	/* Maximum uint32_t */
 #define LOG2  0.301029995664
 #define Button_bit(b)	(1 << ((b)-1))
 

sys/src/cmd/hget.c

@@ -91,7 +91,7 @@ int	headerprint;
 
 struct {
 	char	*name;
-	int	(*f)(URL*, URL*, Range*, Out*, long);
+	int	(*f)(URL*, URL*, Range*, Out*, int32_t);
 } method[] = {
 	[Http]	{ "http",	dohttp },
 	[Https]	{ "https",	dohttp },
@@ -112,7 +112,7 @@ main(int argc, char **argv)
 	URL u;
 	Range r;
 	int errs, n;
-	ulong mtime;
+	uint32_t mtime;
 	Dir *d;
 	char postbody[4096], *p, *e, *t, *hpx;
 	URL px; // Proxy
@@ -162,7 +162,7 @@ main(int argc, char **argv)
 
 	if(net != nil){
 		if(strlen(net) > sizeof(tcpdir)-5)
-			sysfatal("network mount point too long");
+			sysfatal("network mount point too int32_t");
 		snprint(tcpdir, sizeof(tcpdir), "%s/tcp", net);
 	} else
 		snprint(tcpdir, sizeof(tcpdir), "tcp");
@@ -316,7 +316,7 @@ struct
 } note;
 
 void
-catch(void*, char*)
+catch(void *v, char *c)
 {
 	Dir d;
 
@@ -680,7 +680,7 @@ getheader(int fd, char *buf, int n)
 }
 
 void
-hhetag(char *p, URL *u, Range*)
+hhetag(char *p, URL *u, Range *r)
 {
 	if(u->etag != nil){
 		if(strcmp(u->etag, p) != 0)
@@ -692,7 +692,7 @@ hhetag(char *p, URL *u, Range*)
 char*	monthchars = "janfebmaraprmayjunjulaugsepoctnovdec";
 
 void
-hhmtime(char *p, URL *u, Range*)
+hhmtime(char *p, URL *u, Range *r)
 {
 	char *month, *day, *yr, *hms;
 	char *fields[6];
@@ -759,13 +759,13 @@ hhmtime(char *p, URL *u, Range*)
 }
 
 void
-hhclen(char *p, URL*, Range *r)
+hhclen(char *p, URL *u, Range *r)
 {
 	r->end = atoi(p);
 }
 
 void
-hhcrange(char *p, URL*, Range *r)
+hhcrange(char *p, URL *u, Range *r)
 {
 	char *x;
 	int64_t l;
@@ -784,7 +784,7 @@ hhcrange(char *p, URL*, Range *r)
 }
 
 void
-hhuri(char *p, URL *u, Range*)
+hhuri(char *p, URL *u, Range *r)
 {
 	if(*p != '<')
 		return;
@@ -795,13 +795,13 @@ hhuri(char *p, URL *u, Range*)
 }
 
 void
-hhlocation(char *p, URL *u, Range*)
+hhlocation(char *p, URL *u, Range *r)
 {
 	u->redirect = strdup(p);
 }
 
 void
-hhauth(char *p, URL *u, Range*)
+hhauth(char *p, URL *u, Range *r)
 {
 	char *f[4];
 	UserPasswd *up;

sys/src/cmd/history.c

@@ -10,7 +10,7 @@
 #include	<u.h>
 #include	<libc.h>
 
-#define	MINUTE(x)	((long)(x)*60L)
+#define	MINUTE(x)	((int32_t)(x)*60L)
 #define	HOUR(x)		(MINUTE(x)*60L)
 #define	YEAR(x)		(HOUR(x)*24L*360L)
 
@@ -26,9 +26,9 @@ int	ndargv = 1;
 
 void	usage(void);
 void	ysearch(char*, char*);
-long	starttime(char*);
-void	lastbefore(ulong, char*, char*, char*);
-char*	prtime(ulong);
+int32_t	starttime(char*);
+void	lastbefore(uint32_t, char*, char*, char*);
+char*	prtime(uint32_t);
 void	darg(char*);
 
 void
@@ -112,7 +112,7 @@ ysearch(char *file, char *ndump)
 	Tm *tm;
 	Waitmsg *w;
 	Dir *dir, *d;
-	ulong otime, dt;
+	uint32_t otime, dt;
 	int toggle, started, missing;
 
 	fil[0] = 0;
@@ -127,7 +127,7 @@ ysearch(char *file, char *ndump)
 			p = fil+strlen(fil);
 		if(ndump == nil){
 			if(p-fil >= sizeof nbuf-10){
-				fprint(2, "%s: dump name too long", fil);
+				fprint(2, "%s: dump name too int32_t", fil);
 				return;
 			}
 			memmove(nbuf, fil+3, p-(fil+3));
@@ -229,12 +229,12 @@ ysearch(char *file, char *ndump)
 }
 
 void
-lastbefore(ulong t, char *f, char *b, char *ndump)
+lastbefore(uint32_t t, char *f, char *b, char *ndump)
 {
 	Tm *tm;
 	Dir *dir;
 	int vers, try;
-	ulong t0, mtime;
+	uint32_t t0, mtime;
 	int i, n, fd;
 
 	t0 = t;
@@ -297,7 +297,7 @@ lastbefore(ulong t, char *f, char *b, char *ndump)
 }
 
 char*
-prtime(ulong t)
+prtime(uint32_t t)
 {
 	static char buf[100];
 	char *b;
@@ -313,11 +313,11 @@ prtime(ulong t)
 	return buf;
 }
 
-long
+int32_t
 starttime(char *s)
 {
 	Tm *tm;
-	long t, dt;
+	int32_t t, dt;
 	int i, yr, mo, da;
 
 	t = time(0);

sys/src/cmd/html2ms.c

@@ -377,7 +377,7 @@ printsol(char *fmt, ...)
 void
 g_ignore(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 }
 
 void
@@ -430,14 +430,14 @@ g_list(Goobie *g, char *arg)
 void
 g_br(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".br\n");
 }
 
 void
 g_li(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	if(lsp <= 0 || lsp > SSIZE){
 		printsol(".IP \\(bu\n");
 		return;
@@ -455,7 +455,7 @@ g_li(Goobie *g, char *arg)
 void
 g_listend(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	if(--lsp < 0)
 		lsp = 0;
 	printsol(".LP\n");
@@ -464,14 +464,14 @@ g_listend(Goobie *g, char *arg)
 void
 g_display(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".DS\n");
 }
 
 void
 g_pre(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".DS L\n");
 	inpre = 1;
 }
@@ -479,7 +479,7 @@ g_pre(Goobie *g, char *arg)
 void
 g_displayend(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".DE\n");
 	inpre = 0;
 }
@@ -509,7 +509,7 @@ g_fpush(Goobie *g, char *arg)
 void
 g_fpop(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	fsp--;
 	if(fsp < SSIZE)
 		font = fontstack[fsp];
@@ -522,21 +522,21 @@ g_fpop(Goobie *g, char *arg)
 void
 g_indent(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".RS\n");
 }
 
 void
 g_exdent(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".RE\n");
 }
 
 void
 g_dt(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".IP \"");
 	quoting = 1;
 }
@@ -544,7 +544,7 @@ g_dt(Goobie *g, char *arg)
 void
 g_hr(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".br\n");
 	printsol("\\l'5i'\n");
 }
@@ -590,25 +590,25 @@ g_hr(Goobie *g, char *arg)
 void
 g_table(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".TS\ncenter ;\n");
 }
 
 void
 g_tableend(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 	printsol(".TE\n");
 }
 
 void
 g_caption(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 }
 
 void
 g_captionend(Goobie *g, char *arg)
 {
-	USED(g, arg);
+	USED(g); USED(arg);
 }

sys/src/cmd/iconv.c

@@ -50,7 +50,7 @@ main(int argc, char *argv[])
 {
 	char *tostr, *file;
 	int fd, uncompressed;
-	ulong tochan;
+	uint32_t tochan;
 	Memimage *m, *n;
 
 	tostr = nil;

sys/src/cmd/import.c

@@ -38,7 +38,7 @@ int		timedout;
 int	connect(char*, char*, int);
 int	passive(void);
 int	old9p(int);
-void	catcher(void*, char*);
+void	catcher(void *c, char*);
 void	sysfatal(char*, ...);
 void	usage(void);
 int	filter(int, char *, char *);
@@ -204,8 +204,8 @@ main(int argc, char **argv)
 			encprotos[encproto]);
 
 	if (encproto != Encnone && ealgs && ai) {
-		uchar key[16];
-		uchar digest[SHA1dlen];
+		unsigned char key[16];
+		unsigned char digest[SHA1dlen];
 		char fromclientsecret[21];
 		char fromserversecret[21];
 		int i;
@@ -256,7 +256,7 @@ main(int argc, char **argv)
 }
 
 void
-catcher(void*, char *msg)
+catcher(void *v, char *msg)
 {
 	timedout = 1;
 	if(strcmp(msg, "alarm") == 0)

sys/src/cmd/init.c

@@ -125,7 +125,7 @@ pass(int fd)
 static int gotnote;
 
 void
-pinhead(void*, char *msg)
+pinhead(void *c, char *msg)
 {
 	gotnote = 1;
 	fprint(2, "init got note '%s'\n", msg);

sys/src/cmd/join.c

@@ -38,7 +38,7 @@ int	olistf[NIN*NFLD]; /* from these files */
 int	no;		/* number of entries in olist */
 char *sepstr	= " ";
 int	discard;	/* count of truncated lines */
-Rune	null[Bsize]	= L"";
+Rune	null[Bsize]	= { 0 };
 Biobuf binbuf, boutbuf;
 Biobuf *bin, *bout;
 

sys/src/cmd/ktrace.c

@@ -13,10 +13,10 @@
 #include <mach.h>
 #include <ctype.h>
 
-static	int	rtrace(uvlong, uvlong, uvlong);
-static	int	ctrace(uvlong, uvlong, uvlong);
-static	int	i386trace(uvlong, uvlong, uvlong);
-static	int	amd64trace(uvlong, uvlong, uvlong);
+static	int	rtrace(uint64_t, uint64_t, uint64_t);
+static	int	ctrace(uint64_t, uint64_t, uint64_t);
+static	int	i386trace(uint64_t, uint64_t, uint64_t);
+static	int	amd64trace(uint64_t, uint64_t, uint64_t);
 static	uint64_t	getval(uint64_t);
 static	void	inithdr(int);
 static	void	fatal(char*, ...);
@@ -69,8 +69,8 @@ static void (*fmt)(char*, uint64_t) = printaddr;
 void
 main(int argc, char *argv[])
 {
-	int (*t)(uvlong, uvlong, uvlong);
-	uvlong pc, sp, link;
+	int (*t)(uint64_t, uint64_t, uint64_t);
+	uint64_t pc, sp, link;
 	int fd;
 
 	ARGBEGIN{

sys/src/cmd/lens.c

@@ -75,7 +75,7 @@ main(int argc, char *argv[])
 	uint32_t chan;
 	int d;
 
-	USED(argc, argv);
+	USED(argc); USED(argv);
 	if(initdraw(nil, nil, "lens") < 0){
 		fprint(2, "lens: initdraw failed: %r\n");
 		exits("initdraw");

sys/src/cmd/lnfs.c

@@ -56,13 +56,13 @@ int	debug;
 
 Fid *	newfid(int);
 void	io(void);
-void	*erealloc(void*, uint32_t);
+void	*erealloc(void *c, uint32_t);
 void	*emalloc(uint32_t);
 char	*estrdup(char*);
 void	usage(void);
 void	fidqid(Fid*, Qid*);
-char*	short2long(char*);
-char*	long2short(char*, int);
+char*	short2int32_t(char*);
+char*	int32_t2short(char*, int);
 void	readnames(void);
 void	post(char*, int);
 
@@ -192,7 +192,7 @@ post(char *srvname, int pfd)
 		sysfatal("writing %s: %r", srvname);
 }
 char*
-rversion(Fid*)
+rversion(Fid *fi)
 {
 	Fid *f;
 
@@ -211,7 +211,7 @@ rversion(Fid*)
 }
 
 char*
-rauth(Fid*)
+rauth(Fid *f)
 {
 	return Enoauth;
 }
@@ -283,7 +283,7 @@ rwalk(Fid *f)
 	npath = s_clone(f->path);
 	if(thdr.nwname > 0){
 		for(i=0; i<thdr.nwname && i<MAXWELEM; i++){
-			name = long2short(thdr.wname[i], 0);
+			name = int32_t2short(thdr.wname[i], 0);
 			if(strcmp(name, ".") == 0){
 				;
 			} else if(strcmp(name, "..") == 0){
@@ -355,7 +355,7 @@ rcreate(Fid *f)
 	if(readonly)
 		return Eperm;
 	readnames();
-	name = long2short(thdr.name, 1);
+	name = int32_t2short(thdr.name, 1);
 	if(f->fd >= 0)
 		return Eisopen;
 	s_append(f->path, "/");
@@ -388,7 +388,7 @@ rreaddir(Fid *f)
 			return passerror();
 		readnames();
 		for(i = 0; i < f->ndir; i++)
-			f->dir[i].name = short2long(f->dir[i].name);
+			f->dir[i].name = short2int32_t(f->dir[i].name);
 	}
 
 	/* copy in as many directory entries as possible */
@@ -477,7 +477,7 @@ rstat(Fid *f)
 	d = dirstat(s_to_c(f->path));
 	if(d == nil)
 		return passerror();
-	d->name = short2long(d->name);
+	d->name = short2int32_t(d->name);
 	n = convD2M(d, statbuf, sizeof statbuf);
 	free(d);
 	if(n <= BIT16SZ)
@@ -496,7 +496,7 @@ rwstat(Fid *f)
 	if(readonly)
 		return Eperm;
 	convM2D(thdr.stat, thdr.nstat, &d, (char*)rdata);
-	d.name = long2short(d.name, 1);
+	d.name = int32_t2short(d.name, 1);
 	n = dirwstat(s_to_c(f->path), &d);
 	if(n < 0)
 		return passerror();
@@ -753,12 +753,12 @@ readnames(void)
 }
 
 /*
- *  look up a long name,  if it doesn't exist in the
+ *  look up a int32_t name,  if it doesn't exist in the
  *  file, add an entry to the file if the writeflag is
  *  non-zero.  Return a pointer to the short name.
  */
 char*
-long2short(char *longname, int writeflag)
+int32_t2short(char *longname, int writeflag)
 {
 	Name *np;
 
@@ -779,7 +779,7 @@ long2short(char *longname, int writeflag)
  *  longname.
  */
 char*
-short2long(char *shortname)
+short2int32_t(char *shortname)
 {
 	Name *np;
 

sys/src/cmd/lock.c

@@ -19,7 +19,7 @@ static int debug;
 static int lockwait;
 
 void	error(char*);
-void	notifyf(void*, char*);
+void	notifyf(void *c, char*);
 
 static void
 usage(void)

sys/src/cmd/look.c

@@ -350,6 +350,6 @@ getword(Biobuf *f, Rune *rp, int n)
 		}
 		*rp++ = c;
 	}
-	fprint(2, "Look: word too long.  Bailing out.\n");
+	fprint(2, "Look: word too int32_t.  Bailing out.\n");
 	return 0;
 }

sys/src/cmd/ls.c

@@ -149,7 +149,7 @@ output(void)
 	char *s;
 
 	if(!nflag)
-		qsort(dirbuf, ndir, sizeof dirbuf[0], (int (*)(void*, void*))compar);
+		qsort(dirbuf, ndir, sizeof dirbuf[0], (int (*)(void *c, void*))compar);
 	for(i=0; i<ndir; i++)
 		dowidths(dirbuf[i].d);
 	for(i=0; i<ndir; i++) {
@@ -281,11 +281,11 @@ compar(NDir *a, NDir *b)
 		}else if(a->prefix){
 			i = strcmp(a->prefix, bd->name);
 			if(i == 0)
-				i = 1;	/* a is longer than b */
+				i = 1;	/* a is int32_ter than b */
 		}else if(b->prefix){
 			i = strcmp(ad->name, b->prefix);
 			if(i == 0)
-				i = -1;	/* b is longer than a */
+				i = -1;	/* b is int32_ter than a */
 		}else
 			i = strcmp(ad->name, bd->name);
 	}

sys/src/cmd/mc.c

@@ -257,7 +257,7 @@ morechars(void)
 jmp_buf	drawjmp;
 
 void
-terror(Display*, char*)
+terror(Display *d, char *c)
 {
 	longjmp(drawjmp, 1);
 }

sys/src/cmd/md5sum.c

@@ -12,7 +12,7 @@
 #include <bio.h>
 #include <libsec.h>
 
-#pragma	varargck	type	"M"	uchar*
+#pragma	varargck	type	"M"	unsigned char*
 
 static int
 digestfmt(Fmt *fmt)

sys/src/cmd/mntgen.c

@@ -66,7 +66,7 @@ fsopen(Req *r)
 }
 
 static int
-dirgen(int i, Dir *d, void*)
+dirgen(int i, Dir *d, void *v)
 {
 	if(i >= ntab)
 		return -1;
@@ -117,7 +117,7 @@ fsstat(Req *r)
 }
 
 static char*
-fswalk1(Fid *fid, char *name, void*)
+fswalk1(Fid *fid, char *name, void *v)
 {
 	int i;
 	Tab *t;
@@ -165,7 +165,7 @@ fswalk1(Fid *fid, char *name, void*)
 }
 
 static char*
-fsclone(Fid *fid, Fid*, void*)
+fsclone(Fid *fid, Fid *f, void *v)
 {
 	Tab *t;
 

sys/src/cmd/mount.c

@@ -12,7 +12,7 @@
 #include <auth.h>
 
 void	usage(void);
-void	catch(void*, char*);
+void	catch(void *c, char*);
 
 char *keyspec = "";
 

sys/src/cmd/ms2html.c

@@ -58,10 +58,10 @@ typedef struct Goobieif Goobieif;
 struct Goobie
 {
 	char *name;
-	void (*f)(int, char**);
+	void (*f)(int i, char **c);
 };
 
-typedef void F(int, char**);
+typedef void F(int i, char **c);
 typedef void Fif(char*, char*);
 
 struct Goobieif
@@ -1408,13 +1408,13 @@ main(int argc, char **argv)
 }
 
 void
-g_notyet(int, char **argv)
+g_notyet(int i, char **argv)
 {
 	fprint(2, "ms2html: .%s not yet supported\n", argv[0]);
 }
 
 void
-g_ignore(int, char **argv)
+g_ignore(int i, char **argv)
 {
 	if(quiet)
 		return;
@@ -1422,7 +1422,7 @@ g_ignore(int, char **argv)
 }
 
 void
-g_PP(int, char**)
+g_PP(int i, char **c)
 {
 	dohanginghead();
 	closel();
@@ -1432,7 +1432,7 @@ g_PP(int, char**)
 }
 
 void
-g_LP(int, char**)
+g_LP(int i, char **c)
 {
 	dohanginghead();
 	closel();
@@ -1576,7 +1576,7 @@ g_in(int argc, char **argv)
 }
 
 void
-g_HP(int, char**)
+g_HP(int i, char **c)
 {
 	switch(list){
 	default:
@@ -1595,7 +1595,7 @@ g_HP(int, char**)
 }
 
 void
-g_SH(int, char**)
+g_SH(int i, char **c)
 {
 	dohanginghead();
 	dohangingcenter();
@@ -1637,7 +1637,7 @@ g_NH(int argc, char **argv)
 }
 
 void
-g_TL(int, char**)
+g_TL(int i, char **c)
 {
 	char *p, *np;
 	char name[128];
@@ -1684,7 +1684,7 @@ dohangingcenter(void)
 }
 
 void
-g_AU(int, char**)
+g_AU(int i, char **c)
 {
 	closel();
 	dohanginghead();
@@ -1802,7 +1802,7 @@ g_I(int argc, char **argv)
 }
 
 void
-g_br(int, char**)
+g_br(int i, char **c)
 {
 	if(hangingdt){
 		Bprint(&bout, "<dd>");
@@ -1812,7 +1812,7 @@ g_br(int, char**)
 }
 
 void
-g_P1(int, char**)
+g_P1(int i, char **c)
 {
 	if(example == 0){
 		example = 1;
@@ -1821,7 +1821,7 @@ g_P1(int, char**)
 }
 
 void
-g_P2(int, char**)
+g_P2(int i, char **c)
 {
 	if(example){
 		example = 0;
@@ -1830,7 +1830,7 @@ g_P2(int, char**)
 }
 
 void
-g_SM(int, char **argv)
+g_SM(int i, char **argv)
 {
 	Bprint(&bout, "%s", argv[1]);
 }
@@ -1926,7 +1926,7 @@ g_rm(int argc, char **argv)
 	}
 
 void
-g_AB(int, char**)
+g_AB(int i, char **c)
 {
 	closel();
 	dohangingcenter();
@@ -1934,13 +1934,13 @@ g_AB(int, char**)
 }
 
 void
-g_AE(int, char**)
+g_AE(int i, char **c)
 {
 	Bprint(&bout, "</DL>\n");
 }
 
 void
-g_FS(int, char **)
+g_FS(int i, char **c)
 {
 	char *argv[3];
 
@@ -1952,7 +1952,7 @@ g_FS(int, char **)
 }
 
 void
-g_FE(int, char **)
+g_FE(int i, char **c)
 {
 	Bprint(&bout, "</I><DT>&#32;<DD>");
 	closel();
@@ -2025,7 +2025,7 @@ g_de(int argc, char **argv)
 }
 
 void
-g_hrule(int, char**)
+g_hrule(int i, char **c)
 {
 	Bprint(&bout, "<HR>\n");
 }
@@ -2039,49 +2039,49 @@ g_BX(int argc, char **argv)
 }
 
 void
-g_IH(int, char**)
+g_IH(int i, char **c)
 {
 	Bprint(&bout, "Bell Laboratories, Naperville, Illinois, 60540\n");
 }
 
 void
-g_MH(int, char**)
+g_MH(int i, char **c)
 {
 	Bprint(&bout, "Bell Laboratories, Murray Hill, NJ, 07974\n");
 }
 
 void
-g_PY(int, char**)
+g_PY(int i, char **c)
 {
 	Bprint(&bout, "Bell Laboratories, Piscataway, NJ, 08854\n");
 }
 
 void
-g_HO(int, char**)
+g_HO(int i, char **c)
 {
 	Bprint(&bout, "Bell Laboratories, Holmdel, NJ, 07733\n");
 }
 
 void
-g_QS(int, char**)
+g_QS(int i, char **c)
 {
 	Bprint(&bout, "<BLOCKQUOTE>\n");
 }
 
 void
-g_QE(int, char**)
+g_QE(int i, char **c)
 {
 	Bprint(&bout, "</BLOCKQUOTE>\n");
 }
 
 void
-g_RS(int, char**)
+g_RS(int i, char **c)
 {
 	Bprint(&bout, "<DL><DD>\n");
 }
 
 void
-g_RE(int, char**)
+g_RE(int i, char **c)
 {
 	Bprint(&bout, "</DL>\n");
 }
@@ -2089,7 +2089,7 @@ g_RE(int, char**)
 int gif;
 
 void
-g_startgif(int, char **argv)
+g_startgif(int i, char **argv)
 {
 	int fd;
 	int pfd[2];
@@ -2622,7 +2622,7 @@ g_BS(int argc, char **argv)
 }
 
 void
-g_BE(int, char**)
+g_BE(int i, char **c)
 {
 	if (weBref) {
 		Bprint(&bout, "</a>");
@@ -2641,7 +2641,7 @@ g_LB(int argc, char **argv)
 }
 
 void
-g_RT(int, char**)
+g_RT(int i, char **c)
 {
 	g_BE(0,nil);
 	dohanginghead();

sys/src/cmd/mug.c

@@ -1029,7 +1029,7 @@ void
 main(int argc, char **argv)
 {
 	int ccursor, i, fd, k, n, y;
-	uchar *data;
+	unsigned char *data;
 	double gammatab[256];
 	Event e;
 	Mouse m;

sys/src/cmd/nfs.c

@@ -30,7 +30,7 @@ typedef struct Auth Auth;
 struct Auth
 {
 	int ref;
-	uchar *data;
+	unsigned char *data;
 	int ndata;
 };
 
@@ -39,7 +39,7 @@ struct FidAux
 {
 	Nfs3Handle handle;
 
-	u64int cookie;	/* for continuing directory reads */
+	uint64_t cookie;	/* for continuing directory reads */
 	char *name;	/* botch: for remove and rename */
 	Nfs3Handle parent;	/* botch: for remove and rename */
 	char err[ERRMAX];	/* for walk1 */
@@ -114,7 +114,7 @@ mountNull(uint32_t tag)
 int
 mountMnt(Auth *a, uint32_t tag, char *path, Nfs3Handle *h)
 {
-	uchar *freeme;
+	unsigned char *freeme;
 	NfsMount3TMnt tx;
 	NfsMount3RMnt rx;
 
@@ -305,10 +305,10 @@ nfsCreate(Auth *a, uint32_t tag, Nfs3Handle *h, char *name, Nfs3Handle *nh,
 }
 
 int
-nfsRead(Auth *a, uint32_t tag, Nfs3Handle *h, u32int count, u64int offset,
-	uchar **pp, u32int *pcount, uchar **pfreeme)
+nfsRead(Auth *a, uint32_t tag, Nfs3Handle *h, uint32_t count, uint64_t offset,
+	unsigned char **pp, uint32_t *pcount, unsigned char **pfreeme)
 {
-	uchar *freeme;
+	unsigned char *freeme;
 	Nfs3TRead tx;
 	Nfs3RRead rx;
 
@@ -339,8 +339,8 @@ nfsRead(Auth *a, uint32_t tag, Nfs3Handle *h, u32int count, u64int offset,
 }
 
 int
-nfsWrite(Auth *a, uint32_t tag, Nfs3Handle *h, uchar *data, u32int count,
-	 u64int offset, u32int *pcount)
+nfsWrite(Auth *a, uint32_t tag, Nfs3Handle *h, unsigned char *data, uint32_t count,
+	 uint64_t offset, uint32_t *pcount)
 {
 	Nfs3TWrite tx;
 	Nfs3RWrite rx;
@@ -515,9 +515,9 @@ nfsLookup(Auth *a, uint32_t tag, Nfs3Handle *h, char *name, Nfs3Handle *nh,
 }
 
 int
-nfsReadDirPlus(Auth *a, uint32_t tag, Nfs3Handle *h, u32int count,
-	       u64int cookie, uchar **pp,
-	u32int *pcount, int (**unpack)(uchar*, uchar*, uchar**, Nfs3Entry*), uchar **pfreeme)
+nfsReadDirPlus(Auth *a, uint32_t tag, Nfs3Handle *h, uint32_t count,
+	       uint64_t cookie, unsigned char **pp,
+	uint32_t *pcount, int (**unpack)(unsigned char*, unsigned char*, unsigned char**, Nfs3Entry*), unsigned char **pfreeme)
 {
 	Nfs3TReadDirPlus tx;
 	Nfs3RReadDirPlus rx;
@@ -548,9 +548,9 @@ nfsReadDirPlus(Auth *a, uint32_t tag, Nfs3Handle *h, u32int count,
 }
 
 int
-nfsReadDir(Auth *a, uint32_t tag, Nfs3Handle *h, u32int count,
-	   u64int cookie, uchar **pp,
-	u32int *pcount, int (**unpack)(uchar*, uchar*, uchar**, Nfs3Entry*), uchar **pfreeme)
+nfsReadDir(Auth *a, uint32_t tag, Nfs3Handle *h, uint32_t count,
+	   uint64_t cookie, unsigned char **pp,
+	uint32_t *pcount, int (**unpack)(unsigned char*, unsigned char*, unsigned char**, Nfs3Entry*), unsigned char **pfreeme)
 {
 	/* BUG: try readdirplus */
 	char e[ERRMAX];
@@ -617,7 +617,7 @@ struct User
 	uint gid;
 	uint g[16];
 	uint ng;
-	uchar *auth;
+	unsigned char *auth;
 	int nauth;
 };
 
@@ -660,9 +660,9 @@ finduser(User **u, int nu, char *s)
 }
 
 int
-strtoid(User **u, int nu, char *s, u32int *id)
+strtoid(User **u, int nu, char *s, uint32_t *id)
 {
-	u32int x;
+	uint32_t x;
 	char *p;
 	User *uu;
 
@@ -680,7 +680,7 @@ strtoid(User **u, int nu, char *s, u32int *id)
 }
 
 char*
-idtostr(User **u, int nu, u32int id)
+idtostr(User **u, int nu, uint32_t id)
 {
 	char buf[32];
 	int lo, hi, mid;
@@ -700,25 +700,25 @@ idtostr(User **u, int nu, u32int id)
 	return estrdup9p(buf);
 }		
 char*
-uidtostr(u32int uid)
+uidtostr(uint32_t uid)
 {
 	return idtostr(map->ubyid, map->nuser, uid);
 }
 
 char*
-gidtostr(u32int gid)
+gidtostr(uint32_t gid)
 {
 	return idtostr((User**)map->gbyid, map->ngroup, gid);
 }
 
 int
-strtouid(char *s, u32int *id)
+strtouid(char *s, uint32_t *id)
 {
 	return strtoid(map->ubyname, map->nuser, s, id);
 }
 
 int
-strtogid(char *s, u32int *id)
+strtogid(char *s, uint32_t *id)
 {
 	return strtoid((User**)map->gbyid, map->ngroup, s, id);
 }
@@ -768,7 +768,7 @@ Map*
 readmap(char *passwd, char *group)
 {
 	char *s, *f[10], *p, *nextp, *name;
-	uchar *q, *eq;
+	unsigned char *q, *eq;
 	int i, n, nf, line, uid, gid;
 	Biobuf *b;
 	Map *m;
@@ -900,7 +900,7 @@ Auth*
 mkauth(char *user)
 {
 	Auth *a;
-	uchar *p;
+	unsigned char *p;
 	int n;
 	SunAuthUnix au;
 	User *u;
@@ -915,7 +915,7 @@ mkauth(char *user)
 		au.sysname = sys;
 		n = sunAuthUnixSize(&au);
 		a = emalloc(sizeof(Auth)+n);
-		a->data = (uchar*)&a[1];
+		a->data = (unsigned char*)&a[1];
 		a->ndata = n;
 		if(sunAuthUnixPack(a->data, a->data+a->ndata, &p, &au) < 0
 		|| p != a->data+a->ndata){
@@ -928,7 +928,7 @@ if(verbose)print("creds for %s: %.*H\n", user, a->ndata, a->data);
 	}
 
 	a = emalloc(sizeof(Auth)+u->nauth);
-	a->data = (uchar*)&a[1];
+	a->data = (unsigned char*)&a[1];
 	a->ndata = u->nauth;
 	memmove(a->data, u->auth, a->ndata);
 	a->ref = 1;
@@ -1132,12 +1132,12 @@ void
 fsreaddir(Req *r)
 {
 	FidAux *aux;
-	uchar *p, *freeme, *ep, *p9, *ep9;
+	unsigned char *p, *freeme, *ep, *p9, *ep9;
 	char *s;
 	uint count;
-	int n, (*unpack)(uchar*, uchar*, uchar**, Nfs3Entry*);
+	int n, (*unpack)(unsigned char*, unsigned char*, unsigned char**, Nfs3Entry*);
 	Nfs3Entry e;
-	u64int cookie;
+	uint64_t cookie;
 	Dir d;
 
 	aux = r->fid->aux;
@@ -1156,7 +1156,7 @@ fsreaddir(Req *r)
 	}
 	ep = p+count;
 
-	p9 = (uchar*)r->ofcall.data;
+	p9 = (unsigned char*)r->ofcall.data;
 	ep9 = p9+r->ifcall.count;
 
 	/*
@@ -1168,7 +1168,7 @@ fsreaddir(Req *r)
 		aux->cookie = e.cookie;
 		if(strcmp(e.name, ".") == 0 || strcmp(e.name, "..") == 0)
 			continue;
-		for(s=e.name; (uchar)*s >= ' '; s++)
+		for(s=e.name; (unsigned char)*s >= ' '; s++)
 			;
 		if(*s != 0)	/* bad character in name */
 			continue;
@@ -1186,14 +1186,14 @@ fsreaddir(Req *r)
 		p9 += n;
 	}
 	free(freeme);
-	r->ofcall.count = p9 - (uchar*)r->ofcall.data;
+	r->ofcall.count = p9 - (unsigned char*)r->ofcall.data;
 	respond(r, nil);
 }
 	
 void
 fsread(Req *r)
 {
-	uchar *p, *freeme;
+	unsigned char *p, *freeme;
 	uint count;
 	FidAux *aux;
 
@@ -1220,7 +1220,7 @@ fswrite(Req *r)
 	FidAux *aux;
 
 	aux = r->fid->aux;
-	if(nfsWrite(aux->auth, r->tag, &aux->handle, (uchar*)r->ifcall.data, r->ifcall.count, r->ifcall.offset, &count) < 0){
+	if(nfsWrite(aux->auth, r->tag, &aux->handle, (unsigned char*)r->ifcall.data, r->ifcall.count, r->ifcall.offset, &count) < 0){
 		responderrstr(r);
 		return;
 	}
@@ -1394,7 +1394,7 @@ fswalk1(Fid *fid, char *name, void *v)
 }
 
 char*
-fsclone(Fid *fid, Fid *newfid, void*)
+fsclone(Fid *fid, Fid *newfid, void *v)
 {
 	FidAux *a, *na;
 
@@ -1455,7 +1455,7 @@ fsdispatch(void *v)
 }
 
 void
-fsthread(void*)
+fsthread(void *v)
 {
 	Req *r;
 
@@ -1470,7 +1470,7 @@ fssend(Req *r)
 }
 
 void
-fsdie(Srv*)
+fsdie(Srv *s)
 {
 	threadexitsall(nil);
 }
@@ -1527,7 +1527,7 @@ threadmain(int argc, char **argv)
 	SunClient *cli;
 	int proto;
 	uint mport, nport;
-	ulong perm;
+	uint32_t perm;
 	Dir d;
 
 	perm = 0600;
@@ -1626,7 +1626,7 @@ threadmain(int argc, char **argv)
 }
 
 void
-dialproc(void*)
+dialproc(void *v)
 {
 	rfork(RFNAMEG);
 	rfork(RFNOTEG);

sys/src/cmd/nm.c

@@ -37,7 +37,7 @@ Sym	**symptr;
 int	nsym;
 Biobuf	bout;
 
-int	cmp(void*, void*);
+int	cmp(void *c, void*);
 void	error(char*, ...);
 void	execsyms(int);
 void	psym(Sym*, void*);

sys/src/cmd/ns.c

@@ -78,7 +78,7 @@ main(int argc, char **argv)
 	for(line=1; ; line++) {
 		n = read(fd, buf, sizeof(buf));
 		if(n == sizeof(buf)) {
-			fprint(2, "ns: ns string too long\n");
+			fprint(2, "ns: ns string too int32_t\n");
 			exits("read ns");
 		}
 		if(n < 0) {

sys/src/cmd/p.c

@@ -68,7 +68,7 @@ printfile(int f)
 			s = Brdline(b, '\n');
 			if(s == 0){
 				n = Blinelen(b);
-				if(n > 0)	/* line too long for Brdline */
+				if(n > 0)	/* line too int32_t for Brdline */
 					for(j=0; j<n; j++)
 						Bputc(&bout, Bgetc(b));
 				else{		/* true EOF */

sys/src/cmd/pr.c

@@ -107,7 +107,7 @@ extern	void	errprint(void);
 extern	char*	ffiler(char*);
 extern	int	findopt(int, char**);
 extern	int	get(int);
-extern	void*	getspace(ulong);
+extern	void*	getspace(uint32_t);
 extern	int	intopt(char**, int*);
 extern	void	main(int, char**);
 extern	Biobuf*	mustopen(char*, Fils*);
@@ -656,7 +656,7 @@ onintr(void)
 	errprint();
 	exits("error");
 }
-/**/
+*/
 
 /*
  * print accumulated error reports

sys/src/cmd/ps.c

@@ -13,7 +13,7 @@
 
 void	ps(char*);
 void	error(char*);
-int	cmp(void*, void*);
+int	cmp(void *c, void*);
 
 Biobuf	bout;
 int	pflag;

sys/src/cmd/ramfs.c

@@ -25,7 +25,7 @@ enum
 	Nram	= 4096,
 	Maxsize	= 768*1024*1024,
 	Maxfdata	= 8192,
-	Maxulong= (1ULL << 32) - 1,
+	Maxuint32_t= (1ULL << 32) - 1,
 };
 
 typedef struct Fid Fid;
@@ -86,7 +86,7 @@ Fid *	newfid(int);
 uint	ramstat(Ram*, uint8_t*, uint);
 void	error(char*);
 void	io(void);
-void	*erealloc(void*, uint32_t);
+void	*erealloc(void *c, uint32_t);
 void	*emalloc(uint32_t);
 char	*estrdup(char*);
 void	usage(void);
@@ -255,7 +255,7 @@ main(int argc, char *argv[])
 }
 
 char*
-rversion(Fid*)
+rversion(Fid *fi)
 {
 	Fid *f;
 
@@ -274,7 +274,7 @@ rversion(Fid*)
 }
 
 char*
-rauth(Fid*)
+rauth(Fid *f)
 {
 	return "ramfs: no authentication required";
 }

sys/src/cmd/ratrace.c

@@ -124,7 +124,7 @@ reader(void *v)
 }
 
 void
-writer(void *)
+writer(void *v)
 {
 	int newpid;
 	Alt a[4];

sys/src/cmd/rdbfs.c

@@ -157,7 +157,7 @@ usage(void)
 }
 
 void
-noalarm(void*, char *msg)
+noalarm(void *v, char *msg)
 {
 	if(strstr(msg, "alarm"))
 		noted(NCONT);
@@ -168,7 +168,7 @@ noalarm(void*, char *msg)
  * 	send and receive responses on the serial line
  */
 void
-eiaread(void*)
+eiaread(void *v)
 {
 	Req *r;
 	char *p;
@@ -189,12 +189,12 @@ eiaread(void*)
 		}
 		for(tries=0; tries<5; tries++){
 			if(r->type == Twrite){
-				DBG(2, "w%.8lux %.8lux...", (ulong)r->ifcall.offset, *(ulong*)r->ifcall.data);
+				DBG(2, "w%.8lux %.8lux...", (uint32_t)r->ifcall.offset, *(uint32_t*)r->ifcall.data);
 				fprint(rfd, "w%.8lux %.8lux\n",
 				       (uint32_t)r->ifcall.offset,
 				       *(uint32_t*)r->ifcall.data);
 			}else if(r->type == Tread){
-				DBG(2, "r%.8lux...", (ulong)r->ifcall.offset);
+				DBG(2, "r%.8lux...", (uint32_t)r->ifcall.offset);
 				fprint(rfd, "r%.8lux\n",
 				       (uint32_t)r->ifcall.offset);
 			}else{
@@ -230,7 +230,7 @@ eiaread(void*)
 						respond(r, nil);
 						goto Break2;
 					}else
-						DBG(2, "%.8lux ≠ %.8lux\n", strtoul(p+1, 0, 16), (ulong)r->ifcall.offset);
+						DBG(2, "%.8lux ≠ %.8lux\n", strtoul(p+1, 0, 16), (uint32_t)r->ifcall.offset);
 				}else if(p[0] == 'W'){
 					respond(r, nil);
 					goto Break2;
@@ -381,7 +381,7 @@ struct {
 };
 
 void
-killall(Srv*)
+killall(Srv *s)
 {
 	postnote(PNGROUP, getpid(), "kill");
 }

sys/src/cmd/resample.c

@@ -45,11 +45,11 @@ i0(double x)
 }
 
 double
-kaiser(double x, double τ, double α)
+kaiser(double x, double tau, double alpha)
 {
-	if(fabs(x) > τ)
+	if(fabs(x) > tau)
 		return 0.;
-	return i0(α*sqrt(1-(x*x/(τ*τ))))/i0(α);
+	return i0(alpha*sqrt(1-(x*x/(tau*tau))))/i0(alpha);
 }
 
 void
@@ -211,7 +211,7 @@ main(int argc, char *argv[])
 	Rectangle rparam;
 	Memimage *m, *new, *t1, *t2;
 	char *file;
-	ulong tchan;
+	uint32_t tchan;
 	char tmp[100];
 	double v;
 

sys/src/cmd/rx.c

@@ -34,7 +34,7 @@ usage(void)
 }
 
 static int
-catch(void *, char *s)
+catch(void *v, char *s)
 {
 	return strstr(s, "alarm") != nil;
 }

sys/src/cmd/screenlock.c

@@ -155,7 +155,7 @@ checkpassword(void)
 }
 
 void
-blanker(void *)
+blanker(void *v)
 {
 	int tics;
 
@@ -172,7 +172,7 @@ blanker(void *)
 }
 
 void
-grabmouse(void*)
+grabmouse(void *v)
 {
 	int fd, x, y;
 	char ibuf[256], obuf[256];

sys/src/cmd/seconds.c

@@ -46,7 +46,7 @@ enum {
 typedef struct {
 	char	token[Maxtok];
 	char	type;
-	schar	value;
+	uint8_t	value;
 } Datetok;
 
 int dtok_numparsed;
@@ -135,7 +135,7 @@ tryabsdate(char **fields, int nf, Tm *now, Tm *tm)
 		case Year:
 			tm->year = bigval;
 			if (tm->year < 1970 || tm->year > 2106)
-				return -1;	/* can't represent in ulong */
+				return -1;	/* can't represent in uint32_t */
 			/* convert 4-digit year to 1900 origin */
 			if (tm->year >= 1900)
 				tm->year -= 1900;

sys/src/cmd/sed.c

@@ -173,7 +173,7 @@ Rune	*badp = &bad;
 
 char	CGMES[]	 = 	"%S command garbled: %S";
 char	TMMES[]	 = 	"Too much text: %S";
-char	LTL[]	 = 	"Label too long: %S";
+char	LTL[]	 = 	"Label too int32_t: %S";
 char	AD0MES[] =	"No addresses allowed: %S";
 char	AD1MES[] =	"Only one address allowed: %S";
 
@@ -1072,13 +1072,13 @@ dosub(Rune *rhsbuf)
 		}
 		*sp++ = c;
 		if (sp >= &genbuf[LBSIZE])
-			fprint(2, "sed: Output line too long.\n");
+			fprint(2, "sed: Output line too int32_t.\n");
 	}
 	lp = loc2;
 	loc2 = sp - genbuf + linebuf;
 	while (*sp++ = *lp++)
 		if (sp >= &genbuf[LBSIZE])
-			fprint(2, "sed: Output line too long.\n");
+			fprint(2, "sed: Output line too int32_t.\n");
 	lp = linebuf;
 	sp = genbuf;
 	while (*lp++ = *sp++)
@@ -1092,7 +1092,7 @@ place(Rune *sp, Rune *l1, Rune *l2)
 	while (l1 < l2) {
 		*sp++ = *l1++;
 		if (sp >= &genbuf[LBSIZE])
-			fprint(2, "sed: Output line too long.\n");
+			fprint(2, "sed: Output line too int32_t.\n");
 	}
 	return sp;
 }

sys/src/cmd/sha1sum.c

@@ -15,7 +15,7 @@
 #include <bio.h>
 #include <libsec.h>
 
-#pragma	varargck	type	"M"	uchar*
+#pragma	varargck	type	"M"	unsigned char*
 
 typedef struct Sha2 Sha2;
 struct Sha2 {

sys/src/cmd/sort.c

@@ -16,6 +16,19 @@ bugs:
 	00/ff for end of file can conflict with 00/ff characters
 */
 
+static Rune ljan[] = {'J','A','N'};
+static Rune lfeb[] = {'F','E','B'};
+static Rune lmar[] = {'M','A','R'};
+static Rune lapr[] = {'A','P','R'};
+static Rune lmay[] = {'M','A','Y'};
+static Rune ljun[] = {'J','U','N'};
+static Rune ljul[] = {'J','U','L'};
+static Rune laug[] = {'A','U','G'};
+static Rune lsep[] = {'S','E','P'};
+static Rune loct[] = {'O','C','T'};
+static Rune lnov[] = {'N','O','V'};
+static Rune ldec[] = {'D','E','C'};
+
 enum
 {
 	Nline	= 100000,		/* default max number of lines saved in memory */
@@ -124,12 +137,12 @@ void	mergeout(Biobuf*);
 void	newfield(void);
 Line*	newline(Biobuf*);
 void	nomem(void);
-void	notifyf(void*, char*);
+void	notifyf(void *c, char*);
 void	printargs(void);
 void	printout(Biobuf*);
 void	setfield(int, int);
 uint8_t*	skip(uint8_t*, int, int, int, int);
-void	sort4(void*, uint32_t);
+void	sort4(void *c, uint32_t);
 char*	tempfile(int);
 void	tempout(void);
 void	lineout(Biobuf*, Line*);
@@ -240,7 +253,7 @@ dofile(Biobuf *b)
 }
 
 void
-notifyf(void*, char *s)
+notifyf(void *c, char *s)
 {
 
 	if(strcmp(s, "interrupt") == 0)
@@ -368,7 +381,7 @@ tempfile(int n)
 	if(args.tname)
 		dir = args.tname;
 	if(strlen(dir) >= nelem(file)-20) {
-		fprint(2, "temp file directory name is too long: %s\n", dir);
+		fprint(2, "temp file directory name is too int32_t: %s\n", dir);
 		done("tdir");
 	}
 
@@ -1348,7 +1361,7 @@ dokey_dfi(Key *k, uint8_t *lp, uint8_t *lpe, Field *f)
 }
 
 void
-dokey_r(Key *k, uint8_t *lp, uint8_t *lpe, Field*)
+dokey_r(Key *k, uint8_t *lp, uint8_t *lpe, Field *f)
 {
 	int cl, n;
 	uint8_t *kp;
@@ -1377,7 +1390,7 @@ dokey_r(Key *k, uint8_t *lp, uint8_t *lpe, Field*)
 }
 
 void
-dokey_(Key *k, uint8_t *lp, uint8_t *lpe, Field*)
+dokey_(Key *k, uint8_t *lp, uint8_t *lpe, Field *f)
 {
 	int n, cl;
 	uint8_t *kp;
@@ -1523,18 +1536,18 @@ makemapd(Field *f)
 
 Rune*	month[12] =
 {
-	L"JAN",
-	L"FEB",
-	L"MAR",
-	L"APR",
-	L"MAY",
-	L"JUN",
-	L"JUL",
-	L"AUG",
-	L"SEP",
-	L"OCT",
-	L"NOV",
-	L"DEC",
+	ljan,
+	lfeb,
+	lmar,
+	lapr,
+	lmay,
+	ljun,
+	ljul,
+	laug,
+	lsep,
+	loct,
+	lnov,
+	ldec,
 };
 
 /************** radix sort ***********/

sys/src/cmd/stats.c

@@ -832,14 +832,14 @@ readmach(Machine *m, int init)
 }
 
 void
-memval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+memval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	*v = m->devswap[Mem];
 	*vmax = m->devswap[Maxmem];
 }
 
 void
-swapval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+swapval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	*v = m->devswap[Swap];
 	*vmax = m->devswap[Maxswap];
@@ -914,14 +914,14 @@ loadval(Machine *m, uint64_t *v, uint64_t *vmax, int init)
 }
 
 void
-idleval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+idleval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	*v = m->devsysstat[Idle]/m->nproc;
 	*vmax = 100;
 }
 
 void
-inintrval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+inintrval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	*v = m->devsysstat[InIntr]/m->nproc;
 	*vmax = 100;
@@ -968,7 +968,7 @@ ethererrval(Machine *m, uint64_t *v, uint64_t *vmax, int init)
 }
 
 void
-batteryval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+batteryval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	*v = m->batterystats[0];
 	if(m->bitsybatfd >= 0)
@@ -978,7 +978,7 @@ batteryval(Machine *m, uint64_t *v, uint64_t *vmax, int)
 }
 
 void
-signalval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+signalval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	uint32_t l;
 
@@ -995,7 +995,7 @@ signalval(Machine *m, uint64_t *v, uint64_t *vmax, int)
 }
 
 void
-tempval(Machine *m, uint64_t *v, uint64_t *vmax, int)
+tempval(Machine *m, uint64_t *v, uint64_t *vmax, int i)
 {
 	uint32_t l;
 
@@ -1306,7 +1306,7 @@ main(int argc, char *argv[])
 {
 	int i, j;
 	double secs;
-	uvlong v, vmax, nargs;
+	uint64_t v, vmax, nargs;
 	char args[100];
 
 	nmach = 1;

sys/src/cmd/sum.c

@@ -10,7 +10,7 @@
 #include <u.h>
 #include <libc.h>
 
-typedef uint32_t	Sumfn(uint32_t, void*, uint64_t);
+typedef uint32_t	Sumfn(uint32_t, void *c, uint64_t);
 extern Sumfn	sumr, sum5, sum32;
 char		*sumfile(char*, Sumfn*);
 

sys/src/cmd/tar.c

@@ -42,13 +42,13 @@
 #define HOWMANY(a, size)	(((a) + (size) - 1) / (size))
 #define BYTES2TBLKS(bytes)	HOWMANY(bytes, Tblock)
 
-/* read big-endian binary integers; args must be (uchar *) */
+/* read big-endian binary integers; args must be (unsigned char *) */
 #define	G2BEBYTE(x)	(((x)[0]<<8)  |  (x)[1])
 #define	G3BEBYTE(x)	(((x)[0]<<16) | ((x)[1]<<8)  |  (x)[2])
 #define	G4BEBYTE(x)	(((x)[0]<<24) | ((x)[1]<<16) | ((x)[2]<<8) | (x)[3])
-#define	G8BEBYTE(x)	(((vlong)G4BEBYTE(x)<<32) | (u32int)G4BEBYTE((x)+4))
+#define	G8BEBYTE(x)	(((int64_t)G4BEBYTE(x)<<32) | (uint32_t)G4BEBYTE((x)+4))
 
-typedef vlong Off;
+typedef int64_t Off;
 typedef char *(*Refill)(int ar, char *bufs, int justhdr);
 
 enum { Stdin, Stdout, Stderr };
@@ -89,7 +89,7 @@ enum {
 #define issymlink(lf)	((lf) == LF_SYMLINK1 || (lf) == LF_SYMLINK2)
 
 typedef union {
-	uchar	data[Tblock];
+	unsigned char	data[Tblock];
 	struct {
 		char	name[Namsiz];
 		char	mode[8];
@@ -169,7 +169,7 @@ usage(void)
 /* I/O, with error retry or exit */
 
 static int
-cope(char *name, int fd, void *buf, long len, Off off)
+cope(char *name, int fd, void *buf, int32_t len, Off off)
 {
 	fprint(2, "%s: %serror reading %s: %r\n", argv0,
 		(ignerrs? "ignoring ": ""), name);
@@ -184,7 +184,7 @@ cope(char *name, int fd, void *buf, long len, Off off)
 }
 
 static int
-eread(char *name, int fd, void *buf, long len)
+eread(char *name, int fd, void *buf, int32_t len)
 {
 	int rd;
 	Off off;
@@ -197,7 +197,7 @@ eread(char *name, int fd, void *buf, long len)
 }
 
 static int
-ereadn(char *name, int fd, void *buf, long len)
+ereadn(char *name, int fd, void *buf, int32_t len)
 {
 	int rd;
 	Off off;
@@ -210,7 +210,7 @@ ereadn(char *name, int fd, void *buf, long len)
 }
 
 static int
-ewrite(char *name, int fd, void *buf, long len)
+ewrite(char *name, int fd, void *buf, int32_t len)
 {
 	int rd;
 
@@ -461,12 +461,12 @@ putblkmany(int ar, int blks)
  * modifies hp->chksum but restores it; important for the last block of the
  * old archive when updating with `tar rf archive'
  */
-static long
+static int32_t
 chksum(Hdr *hp)
 {
 	int n = Tblock;
-	long i = 0;
-	uchar *cp = hp->data;
+	int32_t i = 0;
+	unsigned char *cp = hp->data;
 	char oldsum[sizeof hp->chksum];
 
 	memmove(oldsum, hp->chksum, sizeof oldsum);
@@ -484,7 +484,7 @@ isustar(Hdr *hp)
 }
 
 /*
- * s is at most n bytes long, but need not be NUL-terminated.
+ * s is at most n bytes int32_t, but need not be NUL-terminated.
  * if shorter than n bytes, all bytes after the first NUL must also
  * be NUL.
  */
@@ -535,10 +535,10 @@ eotar(Hdr *hp)
 }
 
 /*
-static uvlong
-getbe(uchar *src, int size)
+static uint64_t
+getbe(unsigned char *src, int size)
 {
-	uvlong vl = 0;
+	uint64_t vl = 0;
 
 	while (size-- > 0) {
 		vl <<= 8;
@@ -549,7 +549,7 @@ getbe(uchar *src, int size)
  */
 
 static void
-putbe(uchar *dest, uvlong vl, int size)
+putbe(unsigned char *dest, uint64_t vl, int size)
 {
 	for (dest += size; size-- > 0; vl >>= 8)
 		*--dest = vl;
@@ -560,8 +560,8 @@ putbe(uchar *dest, uvlong vl, int size)
  * a tar header block.  this is particularly important for
  * trusting the checksum when trying to resync.
  */
-static uvlong
-hdrotoull(char *st, char *end, uvlong errval, char *name, char *field)
+static uint64_t
+hdrotoull(char *st, char *end, uint64_t errval, char *name, char *field)
 {
 	char *numb;
 
@@ -582,22 +582,22 @@ hdrotoull(char *st, char *end, uvlong errval, char *name, char *field)
  * size in the archive (the archive size may be zero for some file types
  * regardless of the nominal size).
  *
- * gnu and freebsd tars are now recording vlongs as big-endian binary
+ * gnu and freebsd tars are now recording int64_ts as big-endian binary
  * with a flag in byte 0 to indicate this, which permits file sizes up to
- * 2^64-1 (actually 2^80-1 but our file sizes are vlongs) rather than 2^33-1.
+ * 2^64-1 (actually 2^80-1 but our file sizes are int64_ts) rather than 2^33-1.
  */
 static Off
 hdrsize(Hdr *hp)
 {
-	uchar *p;
+	unsigned char *p;
 
-	if((uchar)hp->size[0] == Binnegsz) {
+	if((unsigned char)hp->size[0] == Binnegsz) {
 		fprint(2, "%s: %s: negative length, which is insane\n",
 			argv0, name(hp));
 		return 0;
-	} else if((uchar)hp->size[0] == Binsize) {
-		p = (uchar *)hp->size + sizeof hp->size - 1 -
-			sizeof(vlong);		/* -1 for terminating space */
+	} else if((unsigned char)hp->size[0] == Binsize) {
+		p = (unsigned char *)hp->size + sizeof hp->size - 1 -
+			sizeof(int64_t);		/* -1 for terminating space */
 		return G8BEBYTE(p);
 	}
 
@@ -616,19 +616,19 @@ arsize(Hdr *hp)
 	return hdrsize(hp);
 }
 
-static long
+static int32_t
 parsecksum(char *cksum, char *name)
 {
 	Hdr *hp;
 
-	return hdrotoull(cksum, cksum + sizeof hp->chksum, (uvlong)-1LL,
+	return hdrotoull(cksum, cksum + sizeof hp->chksum, (uint64_t)-1LL,
 		name, "checksum");
 }
 
 static Hdr *
 readhdr(int ar)
 {
-	long hdrcksum;
+	int32_t hdrcksum;
 	Hdr *hp;
 
 	hp = getblkrd(ar, Alldata);
@@ -664,7 +664,7 @@ readhdr(int ar)
  */
 
 /*
- * if name is longer than Namsiz bytes, try to split it at a slash and fit the
+ * if name is int32_ter than Namsiz bytes, try to split it at a slash and fit the
  * pieces into hp->prefix and hp->name.
  */
 static int
@@ -689,7 +689,7 @@ putfullname(Hdr *hp, char *name)
 	}
 
 	if (!posix || namlen > Maxname) {
-		fprint(2, "%s: name too long for tar header: %s\n",
+		fprint(2, "%s: name too int32_t for tar header: %s\n",
 			argv0, name);
 		return -1;
 	}
@@ -744,7 +744,7 @@ mkhdr(Hdr *hp, Dir *dir, char *file)
 		}
 		hp->size[0] = Binsize;
 		/* emit so-called `base 256' representation of size */
-		putbe((uchar *)hp->size+1, dir->length, sizeof hp->size - 2);
+		putbe((unsigned char *)hp->size+1, dir->length, sizeof hp->size - 2);
 		hp->size[sizeof hp->size - 1] = ' ';
 	} else
 		sprint(hp->size, "%11lluo ", dir->length);
@@ -808,7 +808,7 @@ static void
 addtoar(int ar, char *file, char *shortf)
 {
 	int n, fd, isdir;
-	long bytes, blksread;
+	int32_t bytes, blksread;
 	uint32_t blksleft;
 	Hdr *hbp;
 	Dir *dir;
@@ -1143,7 +1143,7 @@ copyfromar(int ar, int fd, char *fname, uint32_t blksleft, Off bytes)
 }
 
 static void
-wrmeta(int fd, Hdr *hp, long mtime, int mode)		/* update metadata */
+wrmeta(int fd, Hdr *hp, int32_t mtime, int mode)		/* update metadata */
 {
 	Dir nd;
 
@@ -1169,7 +1169,7 @@ static void
 extract1(int ar, Hdr *hp, char *fname)
 {
 	int fd = -1, dir = 0;
-	long mtime = strtol(hp->mtime, nil, 8);
+	int32_t mtime = strtol(hp->mtime, nil, 8);
 	uint32_t mode = strtoul(hp->mode, nil, 8) & 0777;
 	Off bytes = hdrsize(hp);		/* for printing */
 	uint32_t blksleft = BYTES2TBLKS(arsize(hp));
@@ -1223,7 +1223,7 @@ static char *
 extract(char **argv)
 {
 	int ar;
-	char *longname;
+	char *int32_tname;
 	char msg[Maxname + 40];
 	Compress *comp;
 	Hdr *hp;
@@ -1243,11 +1243,11 @@ extract(char **argv)
 		sysfatal("can't open archive %s: %r", usefile);
 
 	while ((hp = readhdr(ar)) != nil) {
-		longname = name(hp);
-		if (match(longname, argv))
-			extract1(ar, hp, longname);
+		int32_tname = name(hp);
+		if (match(int32_tname, argv))
+			extract1(ar, hp, int32_tname);
 		else {
-			snprint(msg, sizeof msg, "extracting %s", longname);
+			snprint(msg, sizeof msg, "extracting %s", int32_tname);
 			skip(ar, hp, msg);
 		}
 	}

sys/src/cmd/tee.c

@@ -20,7 +20,7 @@ int	*openf;
 
 char in[8192];
 
-int	intignore(void*, char*);
+int	intignore(void *c, char*);
 
 void
 main(int argc, char **argv)

sys/src/cmd/time.c

@@ -13,7 +13,7 @@
 char	output[4096];
 void	add(char*, ...);
 void	error(char*);
-void	notifyf(void*, char*);
+void	notifyf(void *c, char*);
 
 void
 main(int argc, char *argv[])

sys/src/cmd/tlsclient.c

@@ -34,7 +34,7 @@ void
 main(int argc, char **argv)
 {
 	int fd, netfd;
-	uchar digest[20];
+	unsigned char digest[20];
 	TLSconn conn;
 	char *addr, *file, *filex;
 	Thumbprint *thumb;

sys/src/cmd/tlssrv.c

@@ -19,7 +19,7 @@ char *remotesys, *logfile;
 int debug, p[2];
 
 void
-death(void *, char *)
+death(void *v, char *c)
 {
 	int pid;
 
@@ -123,7 +123,7 @@ void
 main(int argc, char *argv[])
 {
 	TLSconn *conn;
-	uchar buf[BufSize];
+	unsigned char buf[BufSize];
 	char *cert;
 	int n, fd, clearfd;
 

sys/src/cmd/trace.c

@@ -19,10 +19,10 @@
 #include <keyboard.h>
 #include "trace.h"
 
-#pragma	varargck	type	"t"		vlong
-#pragma	varargck	type	"U"		uvlong
+#pragma	varargck	type	"t"		int64_t
+#pragma	varargck	type	"U"		uint64_t
 
-#define NS(x)	((vlong)x)
+#define NS(x)	((int64_t)x)
 #define US(x)	(NS(x) * 1000ULL)
 #define MS(x)	(US(x) * 1000ULL)
 #define S(x)	(MS(x) * 1000ULL)
@@ -39,7 +39,7 @@ typedef struct Event	Event;
 typedef struct Task	Task;
 struct Event {
 	Traceevent;
-	vlong	etime;	/* length of block to draw */
+	int64_t	etime;	/* length of block to draw */
 };
 
 struct Task {
@@ -47,12 +47,12 @@ struct Task {
 	char	*name;
 	int	nevents;	
 	Event	*events;
-	vlong	tstart;
-	vlong	total;
-	vlong	runtime;
-	vlong	runmax;
-	vlong	runthis;
-	long	runs;
+	int64_t	tstart;
+	int64_t	total;
+	int64_t	runtime;
+	int64_t	runmax;
+	int64_t	runthis;
+	int32_t	runs;
 	uint32_t	tevents[Nevent];
 };
 
@@ -62,7 +62,7 @@ enum {
 	K = 1024,
 };
 
-vlong	now, prevts;
+int64_t	now, prevts;
 
 int	newwin;
 int	Width = 1000;		
@@ -97,9 +97,9 @@ char *schedstatename[] = {
 };
 
 struct {
-	vlong	scale;
-	vlong	bigtics;
-	vlong	littletics;
+	int64_t	scale;
+	int64_t	bigtics;
+	int64_t	littletics;
 	int	sleep;
 } scales[] = {
 	{	US(500),	US(100),	US(50),		  0},
@@ -234,7 +234,7 @@ redraw(int scaleno)
 	Point p, q;
 	Rectangle r, rtime;
 	Task *t;
-	vlong ts, oldestts, newestts, period, ppp, scale, s, ss;
+	int64_t ts, oldestts, newestts, period, ppp, scale, s, ss;
 
 #	define time2x(t)	((int)(((t) - oldestts) / ppp))
 
@@ -272,8 +272,8 @@ redraw(int scaleno)
 		s = now - t->tstart;
 		if(t->tevents[SRelease])
 			snprint(buf, sizeof(buf), " per %t — avg: %t max: %t",
-				(vlong)(s/t->tevents[SRelease]),
-				(vlong)(t->runtime/t->tevents[SRelease]),
+				(int64_t)(s/t->tevents[SRelease]),
+				(int64_t)(t->runtime/t->tevents[SRelease]),
 				t->runmax);
 		else if((s /=1000000000LL) != 0)
 			snprint(buf, sizeof(buf), " per 1s — avg: %t total: %t",
@@ -510,7 +510,7 @@ doevent(Task *t, Traceevent *ep)
 {
 	int i, n;
 	Event *event;
-	vlong runt;
+	int64_t runt;
 
 	t->tevents[ep->etype & 0xffff]++;
 	n = t->nevents++;
@@ -737,15 +737,15 @@ int
 timeconv(Fmt *f)
 {
 	char buf[128], *sign;
-	vlong t;
+	int64_t t;
 
 	buf[0] = 0;
 	switch(f->r) {
 	case 'U':
-		t = va_arg(f->args, vlong);
+		t = va_arg(f->args, int64_t);
 		break;
-	case 't':		// vlong in nanoseconds
-		t = va_arg(f->args, vlong);
+	case 't':		// int64_t in nanoseconds
+		t = va_arg(f->args, int64_t);
 		break;
 	default:
 		return fmtstrcpy(f, "(timeconv)");

sys/src/cmd/tweak.c

@@ -227,7 +227,7 @@ main(int argc, char *argv[])
 }
 
 void
-error(Display*, char *s)
+error(Display *d, char *s)
 {
 	if(file)
 		mesg("can't read %s: %s: %r", file, s);

sys/src/cmd/uniq.c

@@ -103,7 +103,7 @@ gline(char *buf)
 		return 1;
 	len = Blinelen(&fin);
 	if(len >= bsize-1)
-		sysfatal("line too long");
+		sysfatal("line too int32_t");
 	memmove(buf, p, len);
 	buf[len-1] = 0;
 	return 0;

sys/src/cmd/unlnfs.c

@@ -91,7 +91,7 @@ rename(char *d, char *old, char *new)
 }
 	
 void
-long2short(char shortname[ENCLEN+1], char *longname)
+int32_t2short(char shortname[ENCLEN+1], char *longname)
 {
 	uint8_t digest[MD5dlen];
 	md5((uint8_t*)longname, strlen(longname), digest, nil);
@@ -113,7 +113,7 @@ readnames(char *lnfile)
 	while((f = Brdstr(bio, '\n', 1)) != nil){
 		n = malloc(sizeof(Name));
 		n->longname = f;
-		long2short(n->shortname, f);
+		int32_t2short(n->shortname, f);
 		n->next = names;
 		names = n;
 	}

sys/src/cmd/unmount.c

@@ -27,7 +27,7 @@ main(int argc, char *argv[])
 		mtpt = argv[2];
 		break;
 	default:
-		SET(mnted, mtpt);
+		SET(mnted); SET(mtpt);
 		fprint(2, "usage: unmount mountpoint\n");
 		fprint(2, "       unmount mounted mountpoint\n");
 		exits("usage");

sys/src/cmd/wc.c

@@ -8,7 +8,7 @@
  */
 
 /*
- * Count bytes within runes, if it fits in a uvlong, and other things.
+ * Count bytes within runes, if it fits in a uint64_t, and other things.
  */
 #include <u.h>
 #include <libc.h>

sys/src/cmd/webcookies.c

@@ -1196,7 +1196,7 @@ fsdestroyfid(Fid *fid)
 }
 
 void
-fsend(Srv*)
+fsend(Srv *s)
 {
 	closejar(jar);
 }

sys/src/cmd/xd.c

@@ -326,7 +326,7 @@ void
 fmt1(char *f)
 {
 	int i;
-	for(i=0; i<ndata; i+=sizeof(ushort))
+	for(i=0; i<ndata; i+=sizeof(uint16_t))
 		xprint(f, (data[i]<<8)|data[i+1]);
 }
 

sys/src/cmd/yacc.c

@@ -465,7 +465,7 @@ others(void)
 	warray("yytok2", temp1, c+1);
 
 	/* table 3 has everything else */
-	Bprint(ftable, "long	yytok3[] =\n{\n");
+	Bprint(ftable, "int32_t	yytok3[] =\n{\n");
 	c = 0;
 	TLOOP(i) {
 		j = tokset[i].value;
@@ -917,7 +917,7 @@ more:
 	/* set pempty to WHOKNOWS */
 	aryfil( pempty, nnonter+1, WHOKNOWS);
 
-	/* loop as long as we keep finding empty nonterminals */
+	/* loop as int32_t as we keep finding empty nonterminals */
 
 again:
 	PLOOP(1, i) {
@@ -1182,7 +1182,7 @@ usage(void)
 void
 setup(int argc, char *argv[])
 {
-	long c, t;
+	int32_t c, t;
 	int i, j, lev, ty, ytab, *p;
 	int vflag, dflag, stem;
 	char actnm[8], *stemc, *s, dirbuf[128];
@@ -2680,7 +2680,7 @@ callopt(void)
 		/* nontrivial situation */
 		if(k <= j) {
 			/* j is now the range */
-/*			j -= k;			/* call scj */
+/*			j -= k;			*//* call scj */
 			if(k > maxoff)
 				maxoff = k;
 		}

util/build.go

@@ -142,10 +142,10 @@ func link(b *build) {
 	if len(b.Programs) > 0 {
 		for _, n := range b.Programs {
 			args := []string{"-o", n}
-			args = append(args, b.Oflags...)
 			f := path.Base(n)
 			o := f[:len(f)] + ".o"
 			args = append(args, []string{o}...)
+			args = append(args, b.Oflags...)
 			args = append(args, b.Libs...)
 			cmd := exec.Command("ld", args...)
 			cmd.Env = append(os.Environ(), b.Env...)