Skip to content

Commit 82540cf

Browse files
committed
[main] Fix error message handling.
1 parent 65a1660 commit 82540cf

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

lib/nrtm.ch

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,19 @@ nrtm._servers var; nrtm._servers !;
157157
"-g {}:3:{}-{}\n" fmt; 1 mlist;
158158
server @; port @; nc;
159159
gen var!;
160-
gen @; ["^%START " m] beforei; r; pop; chomp;
161-
dup; ERROR m; if;
162-
"failed query: {}" fmt; error;
163-
then;
164-
dup; "START Version: \d+ (.+?) (\d+?)-(\d+)$" c;
165-
start var!;
166-
start @; len; 0 =; if;
167-
"did not see response header: got '{}' instead" fmt; error;
160+
gen @; ["^%START " m] beforei; r; prelude var!;
161+
prelude @; pop; chomp;
162+
"START Version: \d+ .+? \d+-\d+$" m; if;
163+
gen @;
164+
nrtm._query-gen;
168165
else;
169-
drop;
166+
prelude @; [^% m] first;
167+
dup; is-null; if;
168+
drop;
169+
"did not see response header" error;
170+
then;
171+
chomp;
172+
"did not see response header: got '{}' instead" fmt; error;
170173
then;
171-
gen @;
172-
nrtm._query-gen;
173174
,,
174175

0 commit comments

Comments
 (0)