shithub: scc

Info  •  Files  •  Log  •  Branches

Merge remote-tracking branch 'simple-cc/master'

--- a/lib/c/fopen.c

+++ b/lib/c/fopen.c

@@ -12,7 +12,7 @@

 	FILE *fp;

 	for (fp = __iob; fp < &__iob[FOPEN_MAX]; ++fp) {

-		if (fp->flags & (_IOREAD | _IOWRITE | _IORW) == 0)

+		if ((fp->flags & (_IOREAD | _IOWRITE | _IORW)) == 0)

 			break;

 	}

 	if (fp == &__iob[FOPEN_MAX]) {

--- a/lib/c/fread.c

+++ b/lib/c/fread.c

@@ -8,6 +8,7 @@

 {

 	unsigned char *bp = ptr;

 	size_t n, i;

+	int c;

 	if (size == 0)

 		return 0;

@@ -15,8 +16,9 @@

 	for (n = 0; n < nmemb; n++) {

 		i = size;

 		do {

-			if ((*bp++ = getc(fp)) == EOF)

+			if ((c = getc(fp)) == EOF)

 				return n;

+			*bp++ = c;

 		} while (--i);

 	}