2 files changed, 76 insertions, 1 deletions
diff --git a/libio/Makefile b/libio/Makefile
index 72a6badabd..ad2d5dda75 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -53,7 +53,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
 	tst-mmap-setvbuf bug-ungetwc1 bug-ungetwc2 tst-atime tst-eof          \
 	tst-freopen bug-rewind bug-rewind2 bug-ungetc bug-fseek \
 	tst-mmap-eofsync tst-mmap-fflushsync bug-mmap-fflush \
-	tst-mmap2-eofsync tst-mmap-offend bug-fopena+
+	tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.
diff --git a/libio/bug-wfflush.c b/libio/bug-wfflush.c
new file mode 100644
index 0000000000..87695f2a81
--- /dev/null
+++ b/libio/bug-wfflush.c
@@ -0,0 +1,75 @@
+/* Test program for bug in wide streams.  */
+
+#include <stdio.h>
+#include <wchar.h>
+
+static void do_prepare (void);
+#define PREPARE(argc, argv) do_prepare ()
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#include <test-skeleton.c>
+
+static char *temp_file;
+
+static void
+do_prepare (void)
+{
+  int fd = create_temp_file ("bug-ungetc.", &temp_file);
+  if (fd == -1)
+    {
+      printf ("cannot create temporary file: %m\n");
+      exit (1);
+    }
+  write (fd, "1!", 2);
+  close (fd);
+}
+
+static int
+do_test (void)
+{
+  FILE *f = fopen (temp_file, "r+");
+
+  if (f == NULL)
+    {
+      printf ("fopen: %m\n");
+      return 1;
+    }
+
+#define L_(s) L##s
+  //#define fwscanf fscanf
+  //#define fwprintf fprintf
+
+  int i;
+  if (fwscanf (f, L_("%d!"), &i) != 1)
+    {
+      printf ("fwscanf failed\n");
+      return 1;
+    }
+
+  if (fseek (f, 0, SEEK_SET) != 0)
+    {
+      printf ("fseek: %m\n");
+      return 1;
+    }
+
+  if (fwprintf (f, L_("1!")) < 2)
+    {
+      printf ("fwprintf: %m\n");
+      return 1;
+    }
+
+  if (fflush (f) != 0)
+    {
+      printf ("fflush: %m\n");
+      return 1;
+    }
+
+  if (fclose (f) != 0)
+    {
+      printf ("fclose: %m\n");
+      return 1;
+    }
+
+  puts ("Test succeeded.");
+  return 0;
+}