commit - 21d0dda69c58e33b1881b55d8cb293a45ffc2691
commit + 16c1defa3dbd8a4388da65e96f53cd767dceb2f3
blob - 172bd8ef7c42244b91111b64e8b7881bd864341f
blob + ce301275216f349918a86a342b266608866004d0
--- man/man1/install.1
+++ man/man1/install.1
If
.B LOCAL.config
contains a line
-.B WSYS=nowsys
+.B WSYSTYPE=nowsys
then the system is built without using X11.
.SH FILES
.TP
blob - 1e222ab34c02b7246beefa94b85ecb3b5a421d5a
blob + 65bf23d0eeec5b0f00998ddfa280ed1347ad1ad5
--- src/cmd/9pserve.c
+++ src/cmd/9pserve.c
int timefmt(Fmt*);
void dorootstat(void);
int stripudirread(Msg*);
-int stripustat(Fcall*, uchar**, int);
+int cvtustat(Fcall*, uchar**, int);
void
usage(void)
}
m->fid->ref++;
if(m->tx.type==Twstat && dotu && !c->dotu){
- if(stripustat(&m->tx, &m->tpkt, 1) < 0){
+ if(cvtustat(&m->tx, &m->tpkt, 1) < 0){
err(m, "cannot convert stat buffer");
continue;
}
break;
case Tstat:
if(!err && dotu && !m->c->dotu)
- stripustat(&m->rx, &m->rpkt, 0);
+ cvtustat(&m->rx, &m->rpkt, 0);
break;
case Topen:
case Tcreate:
m->rx.ename = ename;
repack(&m->rx, &m->rpkt, c->dotu);
free(ename);
+ m->rx.ename = "XXX";
}
if(delhash(m->c->tag, m->ctag, m) == 0)
msgput(m);
Msg **msgtab;
int nmsgtab;
+int nmsg;
Msg *freemsg;
void
m->ref = 1;
if(verbose > 1) fprint(2, "%T msgnew @0x%lux %p tag %d ref %d\n",
getcallerpc(&x), m, m->tag, m->ref);
+ nmsg++;
return m;
}
assert(m->ref > 0);
if(--m->ref > 0)
return;
+ nmsg--;
msgclear(m);
if(m->tpkt){
free(m->tpkt);
e = emalloc(sizeof(Qel));
qlock(&q->lk);
if(q->hungup){
+ free(e);
werrstr("hungup queue");
qunlock(&q->lk);
return -1;
}
int
-stripustat(Fcall *f, uchar **fpkt, int s2u)
+cvtustat(Fcall *f, uchar **fpkt, int tounix)
{
int n;
uchar *buf;
Dir dir;
str = emalloc(f->nstat);
- n = convM2Du(f->stat, f->nstat, &dir, str, s2u);
- if(n <= BIT16SZ)
+ n = convM2Du(f->stat, f->nstat, &dir, str, !tounix);
+ if(n <= BIT16SZ){
+ free(str);
return -1;
- n = sizeD2Mu(&dir, !s2u);
- buf = emalloc(n);
+ }
- n = convD2Mu(&dir, buf, n, !s2u);
- if(n <= BIT16SZ)
- return -1;
+ n = sizeD2Mu(&dir, tounix);
+ buf = emalloc(n);
+ convD2Mu(&dir, f->stat, n, tounix);
f->nstat = n;
f->stat = buf;
repack(f, fpkt, dotu);
free(buf);
+ f->stat = nil; /* is this okay ??? */
free(str);
return 0;
repack(&msg->rx, &msg->rpkt, 0);
free(str);
free(buf);
+ rx->data = nil; /* is this okay ??? */
return 0;
}
blob - f5cf9caa2e9d32c4247444c1adeb9fda9aa8919d
blob + 7263866361abe5dd4deb8124258f78ddde52e243
--- src/libdraw/mkwsysrules.sh
+++ src/libdraw/mkwsysrules.sh
fi
if [ "x$WSYSTYPE" = "x" ]; then
- if [ -d "$X11/include" ]; then
+ if [ -d "$X11" ]; then
WSYSTYPE=x11
else
WSYSTYPE=nowsys
fi
fi
+if [ "x$WSYSTYPE" = "xX11" -a "x$X11H" = "x" ]; then
+ if [ -d "$X11/include" ]; then
+ X11H="-I$X11/include"
+ else
+ X11H=""
+ fi
+fi
+
+
echo 'WSYSTYPE='$WSYSTYPE
echo 'X11='$X11
if [ $WSYSTYPE = x11 ]; then
- echo 'CFLAGS=$CFLAGS -I$X11/include'
+ echo 'CFLAGS=$CFLAGS $X11H'
echo 'HFILES=$HFILES $XHFILES'
fi
-
blob - 2127dca03d5f873487cd95fecb12185f1b8fb632
blob + c5b50ad7775203743dcda7f6c84fc17e80f79520
--- src/libdraw/nowsys-wsys.c
+++ src/libdraw/nowsys-wsys.c
void
drawresizewindow(Rectangle r)
-{
- USED(r);
-
+{
bad();
}