From 108d74cb0a8d27e82550d2772ae64fd7748e151d Mon Sep 17 00:00:00 2001 From: Benjamin Riefenstahl Date: Fri, 7 Jan 2022 10:37:02 +0000 Subject: cmd/sshfs.c (recvproc): prefer error codes over error strings Strings for existing codes in the most used server (OpenSSH) just repeat the error code name. OTOH we like to have wording of the strings under our control as much as possible, so we can easier find and process them. Error strings are still usefull as fallback for compatibility with future versions of the server. --- sys/src/cmd/sshfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/src/cmd/sshfs.c b/sys/src/cmd/sshfs.c index e0c0b1422..ade388f39 100644 --- a/sys/src/cmd/sshfs.c +++ b/sys/src/cmd/sshfs.c @@ -1144,12 +1144,14 @@ recvproc(void *) } r->req->ofcall.count = 0; e = nil; - }else if(msgn > 0){ - e = msg; - e[msgn] = 0; + /* prefer our well-defined error strings to arbitrary + * strings from the server */ }else if(code < nelem(errors)) e = errors[code]; - else{ + else if(msgn > 0){ + e = msg; + e[msgn] = 0; + }else{ snprint(ebuf, sizeof(ebuf), "error code %d", code); e = ebuf; } -- cgit v1.2.3