xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

stdio, ape/stdio: fix order of operations in putc

Browse source 
When calling putc, we need to return either EOF
or the character returned. To distinguish the
two, we need to avoid sign extending 0xff. The
code attempted to do this, but the order of
operations was wrong, so we ended up masking,
setting a character, and then sign extending
the character.

This fixes things so we mask after assignment.
This commit is contained in:
Ori Bernstein 2020-07-11 13:28:58 -07:00
parent ad26dc48a6
commit 1987cc69c8
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/include/ape/stdio.h
View file

@ -106,7 +106,7 @@ extern int getchar(void);
#define getchar() getc(stdin) #define getchar() getc(stdin)
extern char *gets(char *); extern char *gets(char *);
extern int putc(int, FILE *); extern int putc(int, FILE *);
#define putc(c, f) ((f)->wp>=(f)->rp?_IO_putc(c, f):(*(f)->wp++=(c)&_IO_CHMASK)) #define putc(c, f) ((f)->wp>=(f)->rp?_IO_putc(c, f):((*(f)->wp++=(c))&_IO_CHMASK))
extern int _IO_putc(int, FILE *); extern int _IO_putc(int, FILE *);
extern int putchar(int); extern int putchar(int);
#define putchar(c) putc(c, stdout) #define putchar(c) putc(c, stdout)

2
sys/include/stdio.h
View file

@ -92,7 +92,7 @@ int getchar(void);
#define getchar() getc(stdin) #define getchar() getc(stdin)
char *gets(char *); char *gets(char *);
int putc(int, FILE *); int putc(int, FILE *);
#define putc(c, f) ((f)->wp>=(f)->rp?_IO_putc(c, f):(*(f)->wp++=(c)&_IO_CHMASK)) #define putc(c, f) ((f)->wp>=(f)->rp?_IO_putc(c, f):((*(f)->wp++=(c))&_IO_CHMASK))
int _IO_putc(int, FILE *); int _IO_putc(int, FILE *);
int putchar(int); int putchar(int);
#define putchar(c) putc(c, stdout) #define putchar(c) putc(c, stdout)