Update.

	* libio/Makefile: Add rules to check output of tst-fopenloc and
	for memory leaks.
	* libio/tst-fopenloc.c: New file.

2 files changed, 73 insertions, 2 deletions

diff --git a/libio/Makefile b/libio/Makefile
index df8c93c..f49755e 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -47,7 +47,7 @@ routines	:=							      \
 	libc_fatal fmemopen
 
 tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc   \
-	tst_wprintf2 tst-widetext test-fmemopen tst-ext
+	tst_wprintf2 tst-widetext test-fmemopen tst-ext tst-fopenloc
 test-srcs = test-freopen
 
 all: # Make this the default target; it will be defined in Rules.
@@ -80,6 +80,10 @@ CFLAGS-tst_putwc.c = -DOBJPFX=\"$(objpfx)\"
 tst_wprintf2-ARGS = "Some Text"
 
 tst-widetext-ENV = LOCPATH=$(common-objpfx)localedata LANGUAGE=C
+tst-fopenloc-ENV = LOCPATH=$(common-objpfx)localedata \
+		   MALLOC_TRACE=$(objpfx)tst-fopenloc.mtrace
+
+generated = tst-fopenloc.mtrace tst-fopenloc.check
 
 aux	:= fileops genops stdfiles stdio strops
 
@@ -98,9 +102,14 @@ distribute := iolibio.h libioP.h strfile.h Banner test-freopen.sh \
 include ../Rules
 
 ifeq (no,$(cross-compiling))
-tests: $(objpfx)test-freopen.out
+tests: $(objpfx)test-freopen.out $(objpfx)tst-fopenloc.check
 endif
 
 $(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen
 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'	\
 	$(common-objpfx)libio/
+
+$(objpfx)tst-fopenloc.check: $(objpfx)tst-fopenloc.out
+	cmp ../iconvdata/testdata/ISO-8859-1..UTF8 $(objpfx)tst-fopenloc.out \
+	  > $@
+	$(common-objpfx)malloc/mtrace $(objpfx)tst-fopenloc.mtrace >> $@
diff --git a/libio/tst-fopenloc.c b/libio/tst-fopenloc.c
new file mode 100644
index 0000000..db47393
--- /dev/null
+++ b/libio/tst-fopenloc.c
@@ -0,0 +1,62 @@
+/* Test for ,ccs= handling in fopen.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <locale.h>
+#include <mcheck.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+
+static const char inputfile[] = "../iconvdata/testdata/ISO-8859-1";
+
+
+int
+main (void)
+{
+  FILE *fp;
+
+  mtrace ();
+
+  setlocale (LC_ALL, "de_DE.UTF-8");
+
+  fp = fopen (inputfile, "r,ccs=ISO-8859-1");
+  if (fp == NULL)
+    {
+      printf ("cannot open \"%s\": %s\n", inputfile, strerror (errno));
+      exit (1);
+    }
+
+  while (! feof_unlocked (fp))
+    {
+      wchar_t buf[200];
+
+      if (fgetws_unlocked (buf, sizeof (buf) / sizeof (buf[0]), fp) == NULL)
+	break;
+
+      fputws (buf, stdout);
+    }
+
+  fclose (fp);
+
+  return 0;
+}