summaryrefslogtreecommitdiff
path: root/sys/src/ape/lib/ap
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2020-05-15 16:46:20 -0700
committerOri Bernstein <ori@eigenstate.org>2020-05-15 16:46:20 -0700
commit78aec6d5c67cab79e03cdbe4f1a1bd7a7aa15612 (patch)
tree555810535e5c50097cc4ed219b14819e09cc4207 /sys/src/ape/lib/ap
parented4645979c0a6286d92c6bddaee7ea71727b0afb (diff)
Fix scans of more than one character in %[]
This got broken in d8e877a89dae, where we returned 0 on the first mismatch; we want to return 0 only when we consumed no characters.
Diffstat (limited to 'sys/src/ape/lib/ap')
-rw-r--r--sys/src/ape/lib/ap/stdio/vfscanf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/src/ape/lib/ap/stdio/vfscanf.c b/sys/src/ape/lib/ap/stdio/vfscanf.c
index 5cbc1fee5..ac09b86ea 100644
--- a/sys/src/ape/lib/ap/stdio/vfscanf.c
+++ b/sys/src/ape/lib/ap/stdio/vfscanf.c
@@ -416,7 +416,7 @@ icvt_sq(FILE *f, va_list *args, int store, int width, int)
}
if(!match(c, pat)){
nungetc(c, f);
- return 0;
+ goto Done;
}
if(store)
*s++=c;
@@ -424,5 +424,5 @@ icvt_sq(FILE *f, va_list *args, int store, int width, int)
}
Done:
if(store) *s='\0';
- return 1;
+ return nn > 0;
}