mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* libio/Makefile: Add rules to check output of tst-fopenloc and
	for memory leaks.
	* libio/tst-fopenloc.c: New file.
This commit is contained in:
Ulrich Drepper 2001-07-27 18:09:56 +00:00
parent 8e567f5cfa
commit 277f8cdf98
3 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2001-07-27 Ulrich Drepper <drepper@redhat.com>
* libio/Makefile: Add rules to check output of tst-fopenloc and
for memory leaks.
* libio/tst-fopenloc.c: New file.
* iconv/gconv_cache.c (__gconv_compare_alias_cache): New function.
* iconv/gconv_int.h: Add prototype for __gconv_compare_alias_cache.
* iconv/gconv_charset.h: Replace __gconv_lookup_alias prototype with

13
libio/Makefile
View File

@ -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 >> $@

62
libio/tst-fopenloc.c Normal file
View File

@ -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;
}