From d04a1cabb498e244b802f08427847789c1ce95f0 Mon Sep 17 00:00:00 2001 From: forsyth Date: Sun, 5 Jan 2014 22:03:10 +0000 Subject: 20140105-2203 --- appl/cmd/getauthinfo.b | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'appl/cmd/getauthinfo.b') diff --git a/appl/cmd/getauthinfo.b b/appl/cmd/getauthinfo.b index 84c0f1d4..1f561bcd 100644 --- a/appl/cmd/getauthinfo.b +++ b/appl/cmd/getauthinfo.b @@ -63,7 +63,7 @@ init(nil: ref Draw->Context, argv: list of string) user := user(); path := keyname; - if(path[0] != '/' || len path < 2 || path[0:2] != "./") + if(path[0] != '/' && (len path < 2 || path[0:2] != "./")) path = "/usr/" + user + "/keyring/" + keyname; signer := defaultsigner(); @@ -74,7 +74,6 @@ init(nil: ref Draw->Context, argv: list of string) passwd := ""; save := "yes"; - redo := "yes"; for(;;) { signer = promptstring("use signer", signer, RAWOFF); user = promptstring("remote user name", user, RAWOFF); @@ -144,7 +143,7 @@ infofile(fileio: ref Sys->FileIO, sync: chan of int) sync <-= 1; for(;;) alt { - (off, nbytes, fid, rc) := <-fileio.read => + (off, nbytes, nil, rc) := <-fileio.read => if(rc == nil) break; if(off > len infodata){ @@ -155,7 +154,7 @@ infofile(fileio: ref Sys->FileIO, sync: chan of int) rc <-= (infodata[off:off+nbytes], nil); } - (off, data, fid, wc) := <-fileio.write => + (off, data, nil, wc) := <-fileio.write => if(wc == nil) break; -- cgit v1.2.3