diff options
| -rw-r--r-- | sys/src/ape/lib/ap/stdio/vfscanf.c | 4 | ||||
| -rw-r--r-- | sys/src/libstdio/vfscanf.c | 5 |
2 files changed, 5 insertions, 4 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; } diff --git a/sys/src/libstdio/vfscanf.c b/sys/src/libstdio/vfscanf.c index d811b7803..be5c71284 100644 --- a/sys/src/libstdio/vfscanf.c +++ b/sys/src/libstdio/vfscanf.c @@ -339,6 +339,7 @@ static int icvt_sq(FILE *f, va_list *args, int store, int width, int type){ int c, nn; register char *s; register const char *pat; + pat=++fmtp; if(*fmtp=='^') fmtp++; if(*fmtp!='\0') fmtp++; @@ -354,12 +355,12 @@ static int icvt_sq(FILE *f, va_list *args, int store, int width, int type){ } if(!match(c, pat)){ nungetc(c, f); - return 0; + goto Done; } if(store) *s++=c; nn++; } Done: if(store) *s='\0'; - return 1; + return nn > 0; } |