cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

factotum: update for new nbrecvul return value

Browse source 
Unclear whether the old semantics were the right ones,
but at least this preserves what they've been for the past
however many years.
This commit is contained in:
Russ Cox 2020-01-15 10:48:20 -05:00
parent 2c3c82126b
commit e75dbb6af8
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/cmd/auth/factotum/confirm.c
View file

@ -128,17 +128,33 @@ needkeywrite(char *s)
int
needkey(Conv *c, Attr *a)
{
ulong u;
if(c == nil || *needkeyinuse == 0)
return -1;
lbappend(&needkeybuf, "needkey tag=%lud %A", c->tag, a);
flog("needkey %A", a);
return nbrecvul(c->keywait);
// Note: This code used to "return nbrecvul(c->keywait)."
// In Jan 2020 we changed nbrecvul to match Plan 9 and
// the man page and return 0 on "no data available" instead
// of -1. This new code with an explicit nbrecv preserves the
// code's old semantics, distinguishing a sent 0 from "no data".
// That said, this code seems to return -1 unconditionally:
// the c->keywait channel is unbuffered, and the only sending
// to it is done with an nbsendul, which won't block waiting for
// a receiver. So there is no sender for nbrecv to find here.
if(nbrecv(c->keywait, &u) < 0)
return -1;
return u;
}
int
badkey(Conv *c, Key *k, char *msg, Attr *a)
{
ulong u;
if(c == nil || *needkeyinuse == 0)
return -1;
@ -146,5 +162,17 @@ badkey(Conv *c, Key *k, char *msg, Attr *a)
c->tag, k->attr, k->privattr, msg, a);
flog("badkey %A / %N / %s / %A",
k->attr, k->privattr, msg, a);
return nbrecvul(c->keywait);
// Note: This code used to "return nbrecvul(c->keywait)."
// In Jan 2020 we changed nbrecvul to match Plan 9 and
// the man page and return 0 on "no data available" instead
// of -1. This new code with an explicit nbrecv preserves the
// code's old semantics, distinguishing a sent 0 from "no data".
// That said, this code seems to return -1 unconditionally:
// the c->keywait channel is unbuffered, and the only sending
// to it is done with an nbsendul, which won't block waiting for
// a receiver. So there is no sender for nbrecv to find here.
if(nbrecv(c->keywait, &u) < 0)
return -1;
return u;
}