4 files changed, 13 insertions, 3 deletions
diff --git a/src/stdio/_stdio.h b/src/stdio/_stdio.h
index f02715c6..6302ee83 100644
--- a/src/stdio/_stdio.h
+++ b/src/stdio/_stdio.h
@@ -43,8 +43,8 @@
 		if (((__operation) == OP_OUTPUT) && !(__stream)->write) { \
 			UNDEFINED("In call to %s: Attempted output operation on input stream", __func__); \
 		} \
-		if (((__orientation) && (__stream)->orientation) && ((__orientation) != (__stream)->orientation)) { \
-			UNDEFINED("In call to %s(): Requested %s operation on %s oriented stream", __func__, (__orientation) > 0 ? "wide" : "byte", (stream->orientation) > 0 ? "wide" : "byte"); \
+		if ((__orientation) && (__stream)->orientation && ((__orientation) != (__stream)->orientation)) { \
+			UNDEFINED("In call to %s(): Requested %s operation on %s oriented stream", __func__, (__orientation) > 0 ? "wide" : "byte", ((__stream)->orientation) > 0 ? "wide" : "byte"); \
 		} \
 	} while (0)
 #endif
@@ -68,7 +68,7 @@ struct __FILE {
 	int nlocks;		/* in multithreaded, used by flockfile() */
 	int thread;		/* the owning thread if locked */
 
-	unsigned int orientation:2;	/* 0 = undetermind, < 0 = byte, > 0 = wide */
+	int orientation:2;	/* 0 = undetermind, < 0 = byte, > 0 = wide */
 	unsigned int operation:2;	/* TODO: previous operation, NONE, INPUT, OUTPUT (are there others?) */
 	unsigned int eof:1;		/* eof indicator */
 	unsigned int err:1;		/* error indicator */
diff --git a/src/stdio/fputs.c b/src/stdio/fputs.c
index c4d32dec..87523b43 100644
--- a/src/stdio/fputs.c
+++ b/src/stdio/fputs.c
@@ -7,6 +7,7 @@
 int fputs(const char * restrict s, FILE * restrict stream)
 {
 	SIGNAL_SAFE(0);
+	ASSERT_STREAM(stream, ORIENT_BYTE, OP_OUTPUT);
 	ASSERT_NOOVERLAP(s, strlen(s), stream, sizeof(*stream));
 
 	flockfile(stream);
diff --git a/src/stdio/putc_unlocked.c b/src/stdio/putc_unlocked.c
index 9a7b3a60..f3714af8 100644
--- a/src/stdio/putc_unlocked.c
+++ b/src/stdio/putc_unlocked.c
@@ -23,6 +23,14 @@ int putc_unlocked(int c, FILE *stream)
 	}
 	
 	stream->operation = OP_OUTPUT;
+	if (stream->buf == NULL) {
+		if (write(stream->fd, &ch, 1) != 1) {
+			stream->err = 1;
+			return EOF;
+		}
+		return ch;
+	}
+
 	stream->buf[stream->bpos++] = ch;
 	if (stream->bpos == stream->bsize ||
 		(stream->bmode == _IOLBF && ch == '\n') ||
diff --git a/src/stdio/puts.c b/src/stdio/puts.c
index 3392228e..ad9eaa84 100644
--- a/src/stdio/puts.c
+++ b/src/stdio/puts.c
@@ -8,6 +8,7 @@ int puts(const char *s)
 	int ret = 1;
 
 	SIGNAL_SAFE(0);
+	ASSERT_STREAM(stdout, ORIENT_BYTE, OP_OUTPUT);
 
 	flockfile(stdout);