writerune() should operate on a FILE *

expand.c

@@ -74,18 +74,18 @@ expand(const char *file, FILE *fp, int tabstop)
 			if (col)
 				col--;
 			bol = 0;
-			writerune(&r);
+			writerune("<stdout>", stdout, &r);
 			break;
 		case '\n':
 			col = 0;
 			bol = 1;
-			writerune(&r);
+			writerune("<stdout>", stdout, &r);
 			break;
 		default:
 			col++;
 			if (r != ' ')
 				bol = 0;
-			writerune(&r);
+			writerune("<stdout>", stdout, &r);
 			break;
 		}
 	}

libutf/writerune.c

@@ -7,16 +7,16 @@
 #include "../utf.h"
 
 void
-writerune(Rune *r)
+writerune(const char *file, FILE *fp, Rune *r)
 {
 	char buf[UTFmax];
 	int n;
 
 	if ((n = runetochar(buf, r)) > 0) {
-		fwrite(buf, n, 1, stdout);
+		fwrite(buf, n, 1, fp);
-		if (ferror(stdout)) {
+		if (ferror(fp)) {
-			fprintf(stderr, "stdout: write error: %s\n",
+			fprintf(stderr, "%s: write error: %s\n",
-				strerror(errno));
+				file, strerror(errno));
 			exit(1);
 		}
 	}

utf.h

@@ -50,4 +50,4 @@ int isupperrune(Rune);
 int isdigitrune(Rune);
 
 int readrune(const char *, FILE *, Rune *);
-void writerune(Rune *);
+void writerune(const char *, FILE *, Rune *);