aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-26 06:55:29 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-26 06:55:29 +0000
commit4e2e99997a2890df8ab5d7b86646a2b067eb8723 (patch)
tree30c16b2a54b2c166e03f136f4bd99a13db915032
parentc36897fb5bef95d586557f960840ee0c614adabf (diff)
downloadglibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.zip
glibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.tar.gz
glibc-4e2e99997a2890df8ab5d7b86646a2b067eb8723.tar.bz2
Update.
* libio/fileops.c (_IO_new_file_open): Recognize ,ccs= in mode string and load appropriate conversions. * libio/iofwide.c (__libio_codecvt): Renamed from libio_codecvt and made global. * libio/libioP.h: Declare __libio_codecvt. * manual/stdio.texi: Document ,ccs= option for fopen. * wcsmbs/wcsmbsload.c (__wcsmbs_named_conv): New function. * wcsmbs/wcsmbsload.h (__wcsmbs_named_conv): Declare. * libio/iofclose.c: Free conversion data if stream was wide-oriented. * sysdeps/unix/sysv/linux/i386/Dist: Add sys/io.h.
-rw-r--r--ChangeLog13
-rw-r--r--libio/fileops.c60
-rw-r--r--libio/iofclose.c24
-rw-r--r--libio/iofwide.c6
-rw-r--r--libio/libioP.h3
-rw-r--r--manual/stdio.texi15
-rw-r--r--sysdeps/unix/sysv/linux/i386/Dist1
-rw-r--r--wcsmbs/wcsmbsload.c28
-rw-r--r--wcsmbs/wcsmbsload.h6
9 files changed, 146 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b9f092..8739cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2000-01-25 Ulrich Drepper <drepper@cygnus.com>
+ * libio/fileops.c (_IO_new_file_open): Recognize ,ccs= in mode string
+ and load appropriate conversions.
+ * libio/iofwide.c (__libio_codecvt): Renamed from libio_codecvt and
+ made global.
+ * libio/libioP.h: Declare __libio_codecvt.
+ * manual/stdio.texi: Document ,ccs= option for fopen.
+ * wcsmbs/wcsmbsload.c (__wcsmbs_named_conv): New function.
+ * wcsmbs/wcsmbsload.h (__wcsmbs_named_conv): Declare.
+
+ * libio/iofclose.c: Free conversion data if stream was wide-oriented.
+
+ * sysdeps/unix/sysv/linux/i386/Dist: Add sys/io.h.
+
* sysdeps/unix/sysv/linux/Dist: Remove sys/io.h.
* posix/fnmatch_loop.c: Fix problem with FNM_LEADING_DIR.
diff --git a/libio/fileops.c b/libio/fileops.c
index 52039a4..52880c5 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1997-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
Written by Per Bothner <bothner@cygnus.com>.
@@ -37,6 +37,9 @@
#ifdef __STDC__
#include <stdlib.h>
#endif
+#if _LIBC
+# include "../wcsmbs/wcsmbsload.h"
+#endif
#ifndef errno
extern int errno;
#endif
@@ -214,6 +217,11 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
int read_write;
int oprot = 0666;
int i;
+ _IO_FILE *result;
+#if _LIBC
+ const char *cs;
+#endif
+
if (_IO_file_is_open (fp))
return 0;
switch (*mode)
@@ -257,8 +265,54 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
break;
}
- return _IO_file_open (fp, filename, omode|oflags, oprot, read_write,
- is32not64);
+ result = _IO_file_open (fp, filename, omode|oflags, oprot, read_write,
+ is32not64);
+
+
+#if _LIBC
+ /* Test whether the mode string specifies the conversion. */
+ cs = strstr (mode, ",ccs=");
+ if (cs != NULL)
+ {
+ /* Yep. Load the appropriate conversions and set the orientation
+ to wide. */
+ struct gconv_fcts fcts;
+ struct _IO_codecvt *cc = &fp->_wide_data->_codecvt;
+
+ if (__wcsmbs_named_conv (&fcts, cs + 5) != 0)
+ {
+ /* Something went wrong, we cannot load the conversion modules.
+ This means we cannot proceed since the user explicitly asked
+ for these. */
+ _IO_new_fclose (result);
+ return NULL;
+ }
+
+ /* The functions are always the same. */
+ *cc = __libio_codecvt;
+
+ cc->__cd_in.__cd.__nsteps = 1; /* Only one step allowed. */
+ cc->__cd_in.__cd.__steps = fcts.towc;
+
+ cc->__cd_in.__cd.__data[0].__invocation_counter = 0;
+ cc->__cd_in.__cd.__data[0].__internal_use = 1;
+ cc->__cd_in.__cd.__data[0].__is_last = 1;
+ cc->__cd_in.__cd.__data[0].__statep = &result->_wide_data->_IO_state;
+
+ cc->__cd_out.__cd.__nsteps = 1; /* Only one step allowed. */
+ cc->__cd_out.__cd.__steps = fcts.tomb;
+
+ cc->__cd_out.__cd.__data[0].__invocation_counter = 0;
+ cc->__cd_out.__cd.__data[0].__internal_use = 1;
+ cc->__cd_out.__cd.__data[0].__is_last = 1;
+ cc->__cd_out.__cd.__data[0].__statep = &result->_wide_data->_IO_state;
+
+ /* Set the mode now. */
+ result->_mode = 1;
+ }
+#endif /* GNU libc */
+
+ return result;
}
_IO_FILE *
diff --git a/libio/iofclose.c b/libio/iofclose.c
index 04503e7..a10ed92 100644
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1997-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -27,6 +27,9 @@
#ifdef __STDC__
#include <stdlib.h>
#endif
+#if _LIBC
+# include "../iconv/gconv_int.h"
+#endif
int
_IO_new_fclose (fp)
@@ -52,6 +55,25 @@ _IO_new_fclose (fp)
status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
_IO_FINISH (fp);
_IO_funlockfile (fp);
+ if (fp->_mode > 0)
+ {
+#if _LIBC
+ /* This stream has a wide orientation. This means we have to free
+ the conversion functions. */
+ struct _IO_codecvt *cc = &fp->_wide_data->_codecvt;
+
+ if (cc->__cd_in.__cd.__steps->__shlib_handle != NULL)
+ {
+ --cc->__cd_in.__cd.__steps->__counter;
+ __gconv_close_transform (cc->__cd_in.__cd.__steps, 1);
+ }
+ if (cc->__cd_out.__cd.__steps->__shlib_handle != NULL)
+ {
+ --cc->__cd_out.__cd.__steps->__counter;
+ __gconv_close_transform (cc->__cd_out.__cd.__steps, 1);
+ }
+#endif
+ }
_IO_cleanup_region_end (0);
if (_IO_have_backup (fp))
_IO_free_backup_area (fp);
diff --git a/libio/iofwide.c b/libio/iofwide.c
index 853920a..04c8bba 100644
--- a/libio/iofwide.c
+++ b/libio/iofwide.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -62,7 +62,7 @@ static int do_always_noconv (struct _IO_codecvt *codecvt);
/* The functions used in `codecvt' for libio are always the same. */
-static struct _IO_codecvt libio_codecvt =
+struct _IO_codecvt __libio_codecvt =
{
.__codecvt_destr = NULL, /* Destructor, never used. */
.__codecvt_do_out = do_out,
@@ -114,7 +114,7 @@ _IO_fwide (fp, mode)
__wcsmbs_clone_conv (&fcts);
/* The functions are always the same. */
- *cc = libio_codecvt;
+ *cc = __libio_codecvt;
cc->__cd_in.__cd.__nsteps = 1; /* Only one step allowed. */
cc->__cd_in.__cd.__steps = fcts.towc;
diff --git a/libio/libioP.h b/libio/libioP.h
index f31a26b..e3356f4 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -390,6 +390,7 @@ extern struct _IO_jump_t _IO_proc_jumps;
extern struct _IO_jump_t _IO_old_proc_jumps;
extern struct _IO_jump_t _IO_str_jumps;
extern struct _IO_jump_t _IO_wstr_jumps;
+extern struct _IO_codecvt __libio_codecvt;
extern int _IO_do_write __P ((_IO_FILE *, const char *, _IO_size_t));
extern int _IO_new_do_write __P ((_IO_FILE *, const char *, _IO_size_t));
extern int _IO_old_do_write __P ((_IO_FILE *, const char *, _IO_size_t));
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 882494c..98c4de7 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -206,6 +206,21 @@ difference in POSIX systems (including the GNU system). If both
@samp{+} and @samp{b} are specified, they can appear in either order.
@xref{Binary Streams}.
+@cindex stream orientation
+@cindex orientation, stream
+If the @var{opentype} string contains the sequence
+@code{,ccs=@var{STRING}} then @var{STRING} is taken as the name of a
+coded character set and @code{fopen} will mark the stream as
+wide-oriented which appropriate conversion functions in place to convert
+from and to the character set @var{STRING} is place. Any other stream
+is opened initially unoriented and the orientation is decided with the
+first file operation. If the first operation is a wide character
+operation, the stream is not only marked as wide-oriented, also the
+conversion functions to convert to the coded character set used for the
+current locale are loaded. This will not change anymore from this point
+on even if the locale selected for the @code{LC_CTYPE} category is
+changed.
+
Any other characters in @var{opentype} are simply ignored. They may be
meaningful in other systems.
diff --git a/sysdeps/unix/sysv/linux/i386/Dist b/sysdeps/unix/sysv/linux/i386/Dist
index babeff8..087ad88 100644
--- a/sysdeps/unix/sysv/linux/i386/Dist
+++ b/sysdeps/unix/sysv/linux/i386/Dist
@@ -6,6 +6,7 @@ setfsuid.c
setfsgid.c
sys/debugreg.h
sys/elf.h
+sys/io.h
sys/perm.h
sys/procfs.h
sys/reg.h
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c
index 26633e0..719bd1b 100644
--- a/wcsmbs/wcsmbsload.c
+++ b/wcsmbs/wcsmbsload.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -250,3 +250,29 @@ __wcsmbs_clone_conv (struct gconv_fcts *copy)
__libc_lock_unlock (lock);
}
+
+
+/* Clone the current conversion function set. */
+int
+internal_function
+__wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
+{
+ copy->towc = getfct ("INTERNAL", name);
+ if (copy->towc != NULL)
+ {
+ copy->tomb = getfct (name, "INTERNAL");
+ if (copy->tomb == NULL)
+ __gconv_close_transform (copy->towc, 1);
+ }
+
+ if (copy->towc == NULL || copy->tomb == NULL)
+ return 1;
+
+ /* Now increment the usage counters. */
+ if (copy->towc->__shlib_handle != NULL)
+ ++copy->towc->__counter;
+ if (copy->tomb->__shlib_handle != NULL)
+ ++copy->tomb->__counter;
+
+ return 0;
+}
diff --git a/wcsmbs/wcsmbsload.h b/wcsmbs/wcsmbsload.h
index a3652d2..a4d3505 100644
--- a/wcsmbs/wcsmbsload.h
+++ b/wcsmbs/wcsmbsload.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -45,6 +45,10 @@ extern void __wcsmbs_load_conv (const struct locale_data *new_category)
extern void __wcsmbs_clone_conv (struct gconv_fcts *copy)
internal_function;
+/* Find the conversion functions for converting to and from NAME. */
+extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
+ internal_function;
+
/* Check whether the LC_CTYPE locale changed since the last call.
Update the pointers appropriately. */