diff -r c0e23a8829f7 sys/man/1/dtracy --- a/sys/man/1/dtracy Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/1/dtracy Wed May 22 22:42:26 2019 -0400 @@ -122,7 +122,11 @@ The world's worst syscall tracer. .IP .EX -sys:pread:entry if pid == 42 { printf "time %d, fd %d\\n", time, arg0 } +sys:pread:entry if pid == 42 { printf "time %d, fd %d\\n", +.EE +.br +.EX + time, arg0 } .EE .PP Every time the process with PID 42 executes diff -r c0e23a8829f7 sys/man/1/galaxy --- a/sys/man/1/galaxy Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/1/galaxy Wed May 22 22:42:26 2019 -0400 @@ -210,7 +210,11 @@ .IP .EX games/mkgalaxy -av 100 -d 60±50 -v 10 2000 | -games/mkgalaxy -i -av -70 -d 80±50 -v 10 -o 6000,2000 -gv -80,40 3000 | +games/mkgalaxy -i -av -70 -d 80±50 -v 10 -o 6000,2000 +.EE +.br +.EX + -gv -80,40 3000 | games/galaxy -i .EE .PP diff -r c0e23a8829f7 sys/man/1/nedmail --- a/sys/man/1/nedmail Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/1/nedmail Wed May 22 22:42:26 2019 -0400 @@ -285,10 +285,10 @@ % mail 7 messages : ,h -1 H 2129 07/22 12:30 noone@madeup.net "Add Up To 2000 free miles" +1 H 2129 07/22 12:30 noone@madeup.net "2000 free miles" 2 504 07/22 11:43 jmk 3 H 784 07/20 09:05 presotto -4 822 07/11 09:23 xxx@yyy.net "You don't call, you don't write..." +4 822 07/11 09:23 xxx@yyy.net "You don't call..." 5 193 07/06 16:55 presotto 6 529 06/01 19:42 jmk 7 798 09/02 2000 howard diff -r c0e23a8829f7 sys/man/1/replica --- a/sys/man/1/replica Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/1/replica Wed May 22 22:42:26 2019 -0400 @@ -304,7 +304,11 @@ changes), use .EX - replica/pull -c rc/bin/cpurc -s rc/bin/termrc /dist/replica/network + replica/pull -c rc/bin/cpurc -s rc/bin/termrc +.EE +.br +.EX + /dist/replica/network .EE to instruct .I pull diff -r c0e23a8829f7 sys/man/2/9p --- a/sys/man/2/9p Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/9p Wed May 22 22:42:26 2019 -0400 @@ -80,8 +80,9 @@ void readbuf(Req *r, void *src, long nsrc) typedef int Dirgen(int n, Dir *dir, void *aux) void dirread9p(Req *r, Dirgen *gen, void *aux) -void walkandclone(Req *r, char *(*walk1)(Fid *old, char *name, void *v), - char *(*clone)(Fid *old, Fid *new, void *v), void *v) +void walkandclone(Req *r, char *(*walk1) + (Fid *old, char *name, void *v), + char *(*clone)(Fid *old, Fid *new, void *v), void *v) .fi .PP .nf diff -r c0e23a8829f7 sys/man/2/aml --- a/sys/man/2/aml Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/aml Wed May 22 22:42:26 2019 -0400 @@ -22,7 +22,11 @@ int amlload(uchar *data, int len); void* amlwalk(void *dot, char *name); int amleval(void *dot, char *fmt, ...); -void amlenum(void *dot, char *seg, int (*proc)(void *, void *), void *arg); +void amlenum(void *dot, char *seg, +.EE +.br +.EX + int (*proc)(void *, void *), void *arg); void amltake(void *); void amldrop(void *); @@ -75,7 +79,11 @@ underlying type: .EX /* - * b uchar* buffer amllen() returns number of bytes + * b uchar* buffer amllen() returns number +.EE +.br +.EX + * of bytes * s char* string amllen() is strlen() * n char* undefined name amllen() is strlen() * i uvlong* integer diff -r c0e23a8829f7 sys/man/2/complete --- a/sys/man/2/complete Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/complete Wed May 22 22:42:26 2019 -0400 @@ -14,8 +14,16 @@ typedef struct Completion Completion; struct Completion{ uchar advance; /* whether forward progress has been made */ - uchar complete; /* whether the completion now represents a file or directory */ - char *string; /* the string to advance, suffixed " " or "/" for file or directory */ + uchar complete; /* whether the completion now represents +.EE +.br +.EX + a file or directory */ + char *string; /* the string to advance, suffixed " " +.EE +.br +.EX + or "/" for file or directory */ int nmatch; /* number of files that matched */ int nfile; /* number of files returned */ char **filename; /* their names */ diff -r c0e23a8829f7 sys/man/2/control --- a/sys/man/2/control Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/control Wed May 22 22:42:26 2019 -0400 @@ -73,7 +73,9 @@ .sp 0.3 void initcontrols(void) .sp 0.3 -Controlset* newcontrolset(Image *i, Channel *kc, Channel *mc, Channel *rc) +Controlset* newcontrolset(Image *i, Channel *kc, Channel *mc, +.br + Channel *rc) .sp 0.3 void closecontrolset(Controlset *cs) .sp 0.3 diff -r c0e23a8829f7 sys/man/2/frexp --- a/sys/man/2/frexp Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/frexp Wed May 22 22:42:26 2019 -0400 @@ -23,13 +23,17 @@ so that .I value = -.if t .IR frexp ( value )×2\u\s-2 (*eptr) \s0\d -.if n .IR frexp ( value )*2** (*eptr). +.\" .if t .IR frexp ( value )×2\u\s-2 (*eptr) \s0\d +.\" .if n .IR frexp ( value )*2** (*eptr). +.\" t version screws up positioning of page numbers +.IR frexp ( value )*2** (*eptr). .PP .I Ldexp returns the quantity -.if t .IR value ×2\u\s-2 exp \s0\d. -.if n .IR value *2** exp. +.\" .if t .IR value ×2\u\s-2 exp \s0\d. +.\" .if n .IR value *2** exp. +.\" t version screws up positioning of page numbers +.IR value *2** exp. .PP .I Modf returns the signed fractional part of diff -r c0e23a8829f7 sys/man/2/graphics --- a/sys/man/2/graphics Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/graphics Wed May 22 22:42:26 2019 -0400 @@ -31,7 +31,10 @@ void drawerror(Display *d, char *msg) .PP .B -Display* initdisplay(char *devdir, char *win, void(*errfun)(Display*, char*)) +Display* initdisplay(char *devdir, char *win, void(*errfun) +.PP +.B + (Display*, char*)) .PP .B void closedisplay(Display *d) diff -r c0e23a8829f7 sys/man/2/httpd --- a/sys/man/2/httpd Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/httpd Wed May 22 22:42:26 2019 -0400 @@ -91,8 +91,10 @@ HContent *next; char *generic; char *specific; - float q; /* desirability of this kind of file */ - int mxb; /* max uchars until worthless */ + /* desirability of this kind of file */ + float q; + /* max uchars until worthless */ + int mxb; }; struct HContents @@ -129,9 +131,11 @@ */ struct HRange { - int suffix; /* is this a suffix request? */ + /* is this a suffix request? */ + int suffix; ulong start; - ulong stop; /* ~0UL -> not given */ + /* ~0UL -> not given */ + ulong stop; HRange *next; }; @@ -162,15 +166,24 @@ }; struct Hio { - Hio *hh; /* next lower layer Hio, or nil if reads from fd */ - int fd; /* associated file descriptor */ - ulong seek; /* of start */ - uchar state; /* state of the file */ - uchar xferenc; /* chunked transfer encoding state */ - uchar *pos; /* current position in the buffer */ - uchar *stop; /* last character active in the buffer */ - uchar *start; /* start of data buffer */ - ulong bodylen; /* remaining length of message body */ + /* next lower layer Hio, or nil if reads from fd */ + Hio *hh; + /* associated file descriptor */ + int fd; + /* of start */ + ulong seek; + /* state of the file */ + uchar state; + /* chunked transfer encoding state */ + uchar xferenc; + /* current position in the buffer */ + uchar *pos; + /* last character active in the buffer */ + uchar *stop; + /* start of data buffer */ + uchar *start; + /* remaining length of message body */ + ulong bodylen; uchar buf[Hsize+32]; }; @@ -192,13 +205,19 @@ */ struct HttpHead { - int closeit; /* http1.1 close connection after this request? */ - uchar persist; /* http/1.1 requests a persistent connection */ + /* http1.1 close connection after this request? */ + int closeit; + /* http/1.1 requests a persistent connection */ + uchar persist; - uchar expectcont; /* expect a 100-continue */ - uchar expectother; /* expect anything else; should reject with ExpectFail */ - ulong contlen; /* if != ~0UL, length of included message body */ - HFields *transenc; /* if present, encoding of included message body */ + /* expect a 100-continue */ + uchar expectcont; + /* expect anything else; should reject with ExpectFail */ + uchar expectother; + /* if != ~0UL, length of included message body */ + ulong contlen; + /* if present, encoding of included message body */ + HFields *transenc; char *client; char *host; HContent *okencode; @@ -227,17 +246,22 @@ */ struct HConnect { - void *private; /* for the library clients */ - void (*replog)(HConnect*, char*, ...); /* called when reply sent */ + /* for the library clients */ + void *private; + /* called when reply sent */ + void (*replog)(HConnect*, char*, ...); HttpReq req; HttpHead head; Bin *bin; - ulong reqtime; /* time at start of request */ - char xferbuf[HBufSize]; /* buffer for making up or transferring data */ - uchar header[HBufSize + 2]; /* room for \\n\\0 */ + /* time at start of request */ + ulong reqtime; + /* buffer for making up or transferring data */ + char xferbuf[HBufSize]; + /* room for \\n\\0 */ + uchar header[HBufSize + 2]; uchar *hpos; uchar *hstop; Hio hin; @@ -266,8 +290,12 @@ int hiserror(Hio *h); int hload(Hio*, char*); char *hlower(char*); -HContent *hmkcontent(HConnect *c, char *generic, char *specific, HContent *next); -HFields *hmkhfields(HConnect *c, char *s, HSPairs *p, HFields *next); +HContent *hmkcontent(HConnect *c, char *generic, +.br + char *specific, HContent *next); +HFields *hmkhfields(HConnect *c, char *s, HSPairs *p, +.br + HFields *next); char *hmkmimeboundary(HConnect *c); HSPairs *hmkspairs(HConnect *c, char *s, char *t, HSPairs *next); int hmoved(HConnect *c, char *uri); diff -r c0e23a8829f7 sys/man/2/memdraw --- a/sys/man/2/memdraw Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/memdraw Wed May 22 22:42:26 2019 -0400 @@ -112,49 +112,68 @@ .ft L .nf int loadmemimage(Memimage *i, Rectangle r, +.br uchar *buf, int nbuf) int cloadmemimage(Memimage *i, Rectangle r, +.br uchar *buf, int nbuf) int unloadmemimage(Memimage *i, Rectangle r, +.br uchar *buf, int nbuf) void memfillcolor(Memimage *i, ulong color) .PP .ft L .nf void memarc(Memimage *dst, Point c, int a, int b, int thick, +.br Memimage *src, Point sp, int alpha, int phi, Drawop op) void mempoly(Memimage *dst, Point *p, int np, int end0, - int end1, int radius, Memimage *src, Point sp, Drawop op) +.br + int end1, int radius, Memimage *src, Point sp, +.br + Drawop op) void memellipse(Memimage *dst, Point c, int a, int b, +.br int thick, Memimage *src, Point sp, Drawop op) void memfillpoly(Memimage *dst, Point *p, int np, int wind, +.br Memimage *src, Point sp, Drawop op) void memimageline(Memimage *dst, Point p0, Point p1, int end0, - int end1, int radius, Memimage *src, Point sp, Drawop op) +.br + int end1, int radius, Memimage *src, Point sp, +.br Drawop op) void memimagedraw(Memimage *dst, Rectangle r, Memimage *src, +.br Point sp, Memimage *mask, Point mp, Drawop op) .PP .ft L .nf int drawclip(Memimage *dst, Rectangle *dr, Memimage *src, +.br Point *sp, Memimage *mask, Point *mp, +.br Rectangle *sr, Rectangle *mr) -int drawclipnorepl(Memimage *dst, Rectangle *dr, Memimage *src, - Point *sp, Memimage *mask, Point *mp, - Rectangle *sr, Rectangle *mr) +int drawclipnorepl(Memimage *dst, Rectangle *dr, +.br + Memimage *src, Point *sp, Memimage *mask, +.br + Point *mp, Rectangle *sr, Rectangle *mr) Rectangle memlinebbox(Point p0, Point p1, int end0, int end1, +.br int radius) int memlineendsize(int end) .PP .ft L .nf Memsubfont* allocmemsubfont(char *name, int n, int height, +.br int ascent, Fontchar *info, Memimage *i) Memsubfont* openmemsubfont(char *name) void freememsubfont(Memsubfont *f) Point memsubfontwidth(Memsubfont *f, char *s) Memsubfont* getmemdefont(void) Point memimagestring(Memimage *dst, Point p, Memimage *color, +.br Point cp, Memsubfont *f, char *cs) .PP .ft L diff -r c0e23a8829f7 sys/man/2/memlayer --- a/sys/man/2/memlayer Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/memlayer Wed May 22 22:42:26 2019 -0400 @@ -43,7 +43,10 @@ .ta \w'\fLMemimage* 'u .PP .B -Memimage* memlalloc(Memscreen *s, Rectangle r, Refreshfn fn, void *arg, ulong col) +Memimage* memlalloc(Memscreen *s, Rectangle r, Refreshfn fn, +.PP +.B + void *arg, ulong col) .PP .B void memlnorefresh(Memimage *i, Rectangle r, void *arg) .PP diff -r c0e23a8829f7 sys/man/2/ndb --- a/sys/man/2/ndb Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/ndb Wed May 22 22:42:26 2019 -0400 @@ -146,8 +146,10 @@ char *val; Ndbtuple *entry; Ndbtuple *line; - ulong ptr; /* for the application; starts 0 */ - char valbuf[Ndbvlen]; /* initial allocation for val */ + /* for the application; starts 0 */ + ulong ptr; + /* initial allocation for val */ + char valbuf[Ndbvlen]; }; .EE .LP diff -r c0e23a8829f7 sys/man/2/nusb --- a/sys/man/2/nusb Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/nusb Wed May 22 22:42:26 2019 -0400 @@ -80,11 +80,16 @@ }; .sp 0.3v struct Desc { - Conf* conf; /* where this descriptor was read */ - Iface* iface; /* last iface before desc in conf. */ - Ep* ep; /* last endpt before desc in conf. */ - Altc* altc; /* last alt.c. before desc in conf. */ - DDesc data; /* unparsed standard USB descriptor */ + /* where this descriptor was read */ + Conf* conf; + /* last iface before desc in conf. */ + Iface* iface; + /* last endpt before desc in conf. */ + Ep* ep; + /* last alt.c. before desc in conf. */ + Altc* altc; + /* unparsed standard USB descriptor */ + DDesc data; }; .sp 0.3v struct DDesc { diff -r c0e23a8829f7 sys/man/2/pool --- a/sys/man/2/pool Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/pool Wed May 22 22:42:26 2019 -0400 @@ -143,16 +143,25 @@ typedef struct Pool Pool; struct Pool { char* name; - uintptr maxsize; /* of entire Pool */ - uintptr cursize; /* of Pool */ - uintptr curfree; /* total free bytes in Pool */ - uintptr curalloc; /* total allocated bytes in Pool */ - ulong minarena; /* smallest size of new arena */ - ulong quantum; /* allocated blocks should be multiple of */ - ulong minblock; /* smallest newly allocated block */ + /* of entire Pool */ + uintptr maxsize; + /* of Pool */ + uintptr cursize; + /* total free bytes in Pool */ + uintptr curfree; + /* total allocated bytes in Pool */ + uintptr curalloc; + /* smallest size of new arena */ + ulong minarena; + /* allocated blocks should be multiple of */ + ulong quantum; + /* smallest newly allocated block */ + ulong minblock; int flags; - int nfree; /* number of calls to free */ - int lastcompact; /* nfree at time of last poolcompact */ + /* number of calls to free */ + int nfree; + /* nfree at time of last poolcompact */ + int lastcompact; void* (*alloc)(ulong); int (*merge)(void*, void*); void (*move)(void* from, void* to); diff -r c0e23a8829f7 sys/man/2/regexp --- a/sys/man/2/regexp Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/regexp Wed May 22 22:42:26 2019 -0400 @@ -20,19 +20,27 @@ .PP .nf .B -int regexec(Reprog *prog, char *string, Resub *match, int msize) +int regexec(Reprog *prog, char *string, Resub *match, +.br + int msize) .PP .nf .B -void regsub(char *source, char *dest, int dlen, Resub *match, int msize) +void regsub(char *source, char *dest, int dlen, Resub *match, +.br + int msize) .PP .nf .B -int rregexec(Reprog *prog, Rune *string, Resub *match, int msize) +int rregexec(Reprog *prog, Rune *string, Resub *match, +.br + int msize) .PP .nf .B -void rregsub(Rune *source, Rune *dest, int dlen, Resub *match, int msize) +void rregsub(Rune *source, Rune *dest, int dlen, Resub *match, +.br + int msize) .PP .B void regerror(char *msg) diff -r c0e23a8829f7 sys/man/2/venti-cache --- a/sys/man/2/venti-cache Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/2/venti-cache Wed May 22 22:42:26 2019 -0400 @@ -73,7 +73,10 @@ void vtcachesetwrite(VtCache *c, .br .B - int (*write)(VtConn*, uchar[VtScoreSize], uint, uchar*, int)); + int (*write)(VtConn*, uchar[VtScoreSize], +.br +.B + uint, uchar*, int)); .PP .B VtBlock* vtblockcopy(VtBlock *b); diff -r c0e23a8829f7 sys/man/3/draw --- a/sys/man/3/draw Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/3/draw Wed May 22 22:42:26 2019 -0400 @@ -504,7 +504,7 @@ .IR r.min [2*4] .IR scr [2*4] .br -Position the window +Position the window (layer) .I id so that its upper left corner is at the point @@ -512,8 +512,8 @@ on its screen. Simultaneously change its internal (logical) coordinate system so that the point -.I log -corresponds to the upper left corner of the window. +.I r.min +corresponds to the upper left corner of the window, see memlorigin(2). .HP .B O .IR op [1] diff -r c0e23a8829f7 sys/man/3/ip --- a/sys/man/3/ip Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/3/ip Wed May 22 22:42:26 2019 -0400 @@ -841,11 +841,16 @@ typedef struct Udphdr Udphdr; struct Udphdr { - uchar raddr[16]; /* V6 remote address and port */ - uchar laddr[16]; /* V6 local address and port */ - uchar ifcaddr[16]; /* V6 interface address (receive only) */ - uchar rport[2]; /* remote port */ - uchar lport[2]; /* local port */ + /* V6 remote address and port */ + uchar raddr[16]; + /* V6 local address and port */ + uchar laddr[16]; + /* V6 interface address (receive only) */ + uchar ifcaddr[16]; + /* remote port */ + uchar rport[2]; + /* local port */ + uchar lport[2]; }; .EE .PP diff -r c0e23a8829f7 sys/man/4/nfs --- a/sys/man/4/nfs Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/4/nfs Wed May 22 22:42:26 2019 -0400 @@ -186,7 +186,8 @@ .EX case bopp if(! test -f /srv/bopp) - nfs -p 666 -u /lib/ndb/1127.passwd /lib/ndb/1127.group bopp + nfs -p 666 -u /lib/ndb/1127.passwd \e + /lib/ndb/1127.group bopp unmount /n/bopp >[2]/dev/null for(i in u0 u1 u2 u3 u4 u5 u6 u7 u8 u9) mount -a /srv/bopp /n/bopp /$i diff -r c0e23a8829f7 sys/man/4/sshnet --- a/sys/man/4/sshnet Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/4/sshnet Wed May 22 22:42:26 2019 -0400 @@ -27,7 +27,8 @@ [ .IB user @] host .SH DESCRIPTION -The SSH protocol allows clients to make outgoing TCP calls via the server. +The SSH protocol allows clients to make outgoing and incoming TCP calls +via the server. .I Sshnet establishes an SSH connection and, rather than execute a remote command, presents the remote server's TCP stack as a network stack diff -r c0e23a8829f7 sys/man/6/color --- a/sys/man/6/color Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/6/color Wed May 22 22:42:26 2019 -0400 @@ -59,7 +59,8 @@ den = g; if(b > den) den = b; - if(den == 0) /* would divide check; pick grey shades */ + /* would divide check; pick grey shades */ + if(den == 0) c[0] = c[1] = c[2] = 17*v; else{ num = 17*(4*den+v); diff -r c0e23a8829f7 sys/man/8/cpuid --- a/sys/man/8/cpuid Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/8/cpuid Wed May 22 22:42:26 2019 -0400 @@ -69,7 +69,8 @@ term% aux/cpuid vendor GenuineIntel procmodel 000006b4 / 00000006 -features fpu vme de pse tsc msr pae mce cx8 sep mtrr pge mca cmov pat pse36 +features fpu vme de pse tsc msr pae mce cx8 sep mtrr pge \e + mca cmov pat pse36 features mmx fxsr sse extmodel 00000000 / 00000000 procname Mobile Intel(R) Pentium(R) III CPU - M 1133MHz diff -r c0e23a8829f7 sys/man/8/prep --- a/sys/man/8/prep Wed May 15 16:19:20 2019 +0200 +++ b/sys/man/8/prep Wed May 22 22:42:26 2019 -0400 @@ -735,7 +735,8 @@ .EX disk/mbr -m /386/mbr /dev/sdC0/data disk/fdisk -baw /dev/sdC0/data -disk/prep -bw -a^(9fat nvram fscache fsworm other swap) /dev/sdC0/plan9 +disk/prep -bw -a^(9fat nvram fscache fsworm other swap) \e + /dev/sdC0/plan9 disk/format -b /386/pbs -d -r 2 /dev/sdC0/9fat \e /386/9bootfat /386/9pc /tmp/plan9.ini .EE