2001-07-27 Ulrich Drepper <drepper@redhat.com>
+ * libio/fileops.c (_IO_new_file_fopen): Correctly locate ccs=
+ substring. Don't handle ccs= if no descriptor was allocated.
+ Normalize codeset name before calling __wcsmbs_named_conv.
+ Initialize transliteration elements. Free step data structure.
+ * libio/iofclose.c (_IO_new_fclose): Correct freeing of the step data.
+ * libio/iofwide.c (__libio_translit): Renamed from libio_translit
+ and made public. Various little cleanup changes.
+ * wcsmbs/wcsmbsload.h (struct gconv_fcts): Add towc_nsteps and
+ tomb_nsteps member.
+ * wcsmbs/wcsmbsload.c: Add some casts to avoid warnings.
+ (__wcsmbs_gconv_fcts): Initialize towc_nsteps and tomb_nsteps member.
+ (getfct): Take additional parameter with pointer to variable where the
+ number of steps is stored in. Disable code which allows to use more
+ than one step for now. Adjust all callers.
+ (free_mem): New function. Frees data associated with currently
+ selected converters.
+
* malloc/mtrace.pl: Extract addresses from DSOs.
2001-07-26 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/tcsetattr.c (bad_speed): Accept those values.
* termios/cfsetspeed.c (speeds): Likewise.
->>>>>>> 1.5525
2001-07-26 kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/sh/dl-machine.h (elf_machine_load_address): Don't use
-GNU C Library NEWS -- history of user-visible changes. 2001-7-25
+GNU C Library NEWS -- history of user-visible changes. 2001-7-27
Copyright (C) 1992-2000, 2001 Free Software Foundation, Inc.
See the end for copying conditions.
* The Hurd port got a lot more functionality like AIO, various stdio
extensions, etc. Mainly done by Roland McGrath.
+
+* mtrace can now lookup symbols in shared libraries.
\f
Version 2.2.3
# define _POSIX_SOURCE
#endif
#include "libioP.h"
+#include <assert.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#endif
#if _LIBC
# include "../wcsmbs/wcsmbsload.h"
+# include "../iconv/gconv_charset.h"
+# include "../iconv/gconv_int.h"
# include <shlib-compat.h>
#endif
#ifndef errno
# define _IO_new_file_xsputn _IO_file_xsputn
#endif
+
+#ifdef _LIBC
+extern struct __gconv_trans_data __libio_translit;
+#endif
+
+
/* An fstream can be in at most one of put mode, get mode, or putback mode.
Putback mode is a variant of get mode.
int oprot = 0666;
int i;
_IO_FILE *result;
-#if _LIBC
+#ifdef _LIBC
const char *cs;
+ const char *last_recognized;
#endif
if (_IO_file_is_open (fp))
__set_errno (EINVAL);
return NULL;
}
+#ifdef _LIBC
+ last_recognized = mode;
+#endif
for (i = 1; i < 4; ++i)
{
switch (*++mode)
case '+':
omode = O_RDWR;
read_write &= _IO_IS_APPENDING;
+#ifdef _LIBC
+ last_recognized = mode;
+#endif
continue;
case 'x':
oflags |= O_EXCL;
+#ifdef _LIBC
+ last_recognized = mode;
+#endif
continue;
case 'b':
+#ifdef _LIBC
+ last_recognized = mode;
+#endif
default:
/* Ignore. */
continue;
is32not64);
-#if _LIBC
- /* Test whether the mode string specifies the conversion. */
- cs = strstr (mode, ",ccs=");
- if (cs != NULL)
+#ifdef _LIBC
+ if (result != NULL)
{
- /* Yep. Load the appropriate conversions and set the orientation
- to wide. */
- struct gconv_fcts fcts;
- struct _IO_codecvt *cc;
+ /* Test whether the mode string specifies the conversion. */
+ cs = strstr (last_recognized + 1, ",ccs=");
+ if (cs != NULL)
+ {
+ /* Yep. Load the appropriate conversions and set the orientation
+ to wide. */
+ struct gconv_fcts fcts;
+ struct _IO_codecvt *cc;
+ char *endp = __strchrnul (cs + 5, ',');
+ char ccs[endp - (cs + 5) + 3];
+
+ *((char *) __mempcpy (ccs, cs + 5, endp - (cs + 5))) = '\0';
+ strip (ccs, ccs);
+
+ if (__wcsmbs_named_conv (&fcts, ccs[2] == '\0'
+ ? upstr (ccs, cs + 5) : ccs) != 0)
+ {
+ /* Something went wrong, we cannot load the conversion modules.
+ This means we cannot proceed since the user explicitly asked
+ for these. */
+ __set_errno (EINVAL);
+ return NULL;
+ }
- if (! _IO_CHECK_WIDE (fp) || __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;
- }
+ assert (fcts.towc_nsteps == 1);
+ assert (fcts.tomb_nsteps == 1);
+
+ fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end;
+ fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_base;
+
+ /* Clear the state. We start all over again. */
+ memset (&fp->_wide_data->_IO_state, '\0', sizeof (__mbstate_t));
+ memset (&fp->_wide_data->_IO_last_state, '\0', sizeof (__mbstate_t));
+
+ cc = fp->_codecvt = &fp->_wide_data->_codecvt;
- cc = fp->_codecvt = &fp->_wide_data->_codecvt;
+ /* The functions are always the same. */
+ *cc = __libio_codecvt;
- /* The functions are always the same. */
- *cc = __libio_codecvt;
+ cc->__cd_in.__cd.__nsteps = fcts.towc_nsteps;
+ cc->__cd_in.__cd.__steps = fcts.towc;
- 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].__flags = __GCONV_IS_LAST;
+ cc->__cd_in.__cd.__data[0].__statep = &result->_wide_data->_IO_state;
- cc->__cd_in.__cd.__data[0].__invocation_counter = 0;
- cc->__cd_in.__cd.__data[0].__internal_use = 1;
- cc->__cd_in.__cd.__data[0].__flags = __GCONV_IS_LAST;
- cc->__cd_in.__cd.__data[0].__statep = &result->_wide_data->_IO_state;
+ /* XXX For now no transliteration. */
+ cc->__cd_in.__cd.__data[0].__trans = NULL;
- cc->__cd_out.__cd.__nsteps = 1; /* Only one step allowed. */
- cc->__cd_out.__cd.__steps = fcts.tomb;
+ cc->__cd_out.__cd.__nsteps = fcts.tomb_nsteps;
+ 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].__flags = __GCONV_IS_LAST;
- cc->__cd_out.__cd.__data[0].__statep = &result->_wide_data->_IO_state;
+ cc->__cd_out.__cd.__data[0].__invocation_counter = 0;
+ cc->__cd_out.__cd.__data[0].__internal_use = 1;
+ cc->__cd_out.__cd.__data[0].__flags = __GCONV_IS_LAST;
+ cc->__cd_out.__cd.__data[0].__statep =
+ &result->_wide_data->_IO_state;
- /* Set the mode now. */
- result->_mode = 1;
+ /* And now the transliteration. */
+ cc->__cd_out.__cd.__data[0].__trans = &__libio_translit;
+
+ /* Set the mode now. */
+ result->_mode = 1;
+
+ /* We don't need the step data structure anymore. */
+ __gconv_release_cache (fcts.towc, fcts.towc_nsteps);
+ __gconv_release_cache (fcts.tomb, fcts.tomb_nsteps);
+ }
}
#endif /* GNU libc */
the conversion functions. */
struct _IO_codecvt *cc = fp->_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);
- }
+ __gconv_release_step (cc->__cd_in.__cd.__steps);
+ __gconv_release_step (cc->__cd_out.__cd.__steps);
#endif
}
_IO_cleanup_region_end (0);
# include <dlfcn.h>
# include <wchar.h>
#endif
+#include <assert.h>
#include <stdlib.h>
#include <string.h>
#ifdef _LIBC
-static struct __gconv_trans_data libio_translit =
+struct __gconv_trans_data __libio_translit =
{
.__trans_fct = __gconv_transliterate
};
memset (&fp->_wide_data->_IO_last_state, '\0', sizeof (__mbstate_t));
__wcsmbs_clone_conv (&fcts);
+ assert (fcts.towc_nsteps == 1);
+ assert (fcts.tomb_nsteps == 1);
/* The functions are always the same. */
*cc = __libio_codecvt;
- cc->__cd_in.__cd.__nsteps = 1; /* Only one step allowed. */
+ cc->__cd_in.__cd.__nsteps = fcts.towc_nsteps;
cc->__cd_in.__cd.__steps = fcts.towc;
cc->__cd_in.__cd.__data[0].__invocation_counter = 0;
/* XXX For now no transliteration. */
cc->__cd_in.__cd.__data[0].__trans = NULL;
- cc->__cd_out.__cd.__nsteps = 1; /* Only one step allowed. */
+ cc->__cd_out.__cd.__nsteps = fcts.tomb_nsteps;
cc->__cd_out.__cd.__steps = fcts.tomb;
cc->__cd_out.__cd.__data[0].__invocation_counter = 0;
cc->__cd_out.__cd.__data[0].__statep = &fp->_wide_data->_IO_state;
/* And now the transliteration. */
-#ifdef _LIBC
- cc->__cd_out.__cd.__data[0].__trans = &libio_translit;
-#else
- cc->__cd_out.__cd.__data[0].__trans = NULL;
-#endif
+ cc->__cd_out.__cd.__data[0].__trans = &__libio_translit;
}
#else
# ifdef _GLIBCPP_USE_WCHAR_T
cc->__cd_out = iconv_open (external_ccs, internal_ccs);
if (cc->__cd_in == (iconv_t) -1 || cc->__cd_out == (iconv_t) -1)
- /* XXX */
- abort ();
+ {
+ if (cc->__cd_in != (iconv_t) -1)
+ iconv_close (cc->__cd_in);
+ /* XXX */
+ abort ();
+ }
}
# else
# error "somehow determine this from LC_CTYPE"
}
}
$cache{$addr} = $str = $addr;
+ } elsif ($str =~ /^.*[[](0x[^]]*)]$/) {
+ my $addr = $1;
+ return $cache{$addr} if (exists $cache{$addr});
+ if ($binary ne "" && open (ADDR, "addr2line -e $binary $addr|")) {
+ my $line = <ADDR>;
+ chomp $line;
+ close (ADDR);
+ if ($line ne '??:0') {
+ $cache{$addr} = $line;
+ return $cache{$addr};
+ }
+ }
+ $cache{$addr} = $str = $addr;
}
return $str;
}
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
.__shlib_handle = NULL,
.__modname = NULL,
.__counter = INT_MAX,
- .__from_name = "ANSI_X3.4-1968//TRANSLIT",
- .__to_name = "INTERNAL",
+ .__from_name = (char *) "ANSI_X3.4-1968//TRANSLIT",
+ .__to_name = (char *) "INTERNAL",
.__fct = __gconv_transform_ascii_internal,
.__init_fct = NULL,
.__end_fct = NULL,
.__shlib_handle = NULL,
.__modname = NULL,
.__counter = INT_MAX,
- .__from_name = "INTERNAL",
- .__to_name = "ANSI_X3.4-1968//TRANSLIT",
+ .__from_name = (char *) "INTERNAL",
+ .__to_name = (char *) "ANSI_X3.4-1968//TRANSLIT",
.__fct = __gconv_transform_internal_ascii,
.__init_fct = NULL,
.__end_fct = NULL,
struct gconv_fcts __wcsmbs_gconv_fcts =
{
.towc = &to_wc,
- .tomb = &to_mb
+ .towc_nsteps = 1,
+ .tomb = &to_mb,
+ .tomb_nsteps = 1
};
static inline struct __gconv_step *
-getfct (const char *to, const char *from)
+getfct (const char *to, const char *from, size_t *nstepsp)
{
size_t nsteps;
struct __gconv_step *result;
+#if 0
size_t nstateful;
size_t cnt;
+#endif
if (__gconv_find_transform (to, from, &result, &nsteps, 0) != __GCONV_OK)
/* Loading the conversion step is not possible. */
return NULL;
+ /* Maybe it is someday necessary to allow more than one step.
+ Currently this is not the case since the conversions handled here
+ are from and to INTERNAL and there always is a converted for
+ that. It the directly following code is enabled the libio
+ functions will have to allocate appropriate __gconv_step_data
+ elements instead of only one. */
+#if 0
/* Count the number of stateful conversions. Since we will only
have one 'mbstate_t' object available we can only deal with one
stateful conversion. */
if (result[cnt].__stateful)
++nstateful;
if (nstateful > 1)
+#else
+ if (nsteps > 1)
+#endif
{
/* We cannot handle this case. */
__gconv_close_transform (result, nsteps);
result = NULL;
}
+ else
+ *nstepsp = nsteps;
return result;
}
const char *charset_name;
const char *complete_name;
struct __gconv_step *new_towc;
+ size_t new_towc_nsteps;
struct __gconv_step *new_tomb;
+ size_t new_tomb_nsteps;
int use_translit;
/* Free the old conversions. */
- __gconv_close_transform (__wcsmbs_gconv_fcts.tomb, 1);
- __gconv_close_transform (__wcsmbs_gconv_fcts.towc, 1);
+ if (__wcsmbs_gconv_fcts.tomb != &to_mb)
+ __gconv_close_transform (__wcsmbs_gconv_fcts.tomb,
+ __wcsmbs_gconv_fcts.tomb_nsteps);
+ if (__wcsmbs_gconv_fcts.towc != &to_wc)
+ __gconv_close_transform (__wcsmbs_gconv_fcts.towc,
+ __wcsmbs_gconv_fcts.towc_nsteps);
/* Get name of charset of the locale. */
charset_name = new_category->values[_NL_ITEM_INDEX(CODESET)].string;
/* It is not necessary to use transliteration in this direction
since the internal character set is supposed to be able to
represent all others. */
- new_towc = getfct ("INTERNAL", complete_name);
+ new_towc = getfct ("INTERNAL", complete_name, &new_towc_nsteps);
new_tomb = (new_towc != NULL
- ? getfct (complete_name, "INTERNAL") : NULL);
+ ? getfct (complete_name, "INTERNAL", &new_tomb_nsteps)
+ : NULL);
/* If any of the conversion functions is not available we don't
use any since this would mean we cannot convert back and
}
__wcsmbs_gconv_fcts.tomb = new_tomb;
+ __wcsmbs_gconv_fcts.tomb_nsteps = new_tomb_nsteps;
__wcsmbs_gconv_fcts.towc = new_towc;
+ __wcsmbs_gconv_fcts.towc_nsteps = new_towc_nsteps;
}
/* Set last-used variable for current locale. */
}
-/* Clone the current conversion function set. */
+/* Get converters for named charset. */
int
internal_function
__wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
{
- copy->towc = getfct ("INTERNAL", name);
+ copy->towc = getfct ("INTERNAL", name, ©->towc_nsteps);
if (copy->towc != NULL)
{
- copy->tomb = getfct (name, "INTERNAL");
+ copy->tomb = getfct (name, "INTERNAL", ©->tomb_nsteps);
if (copy->tomb == NULL)
- __gconv_close_transform (copy->towc, 1);
+ __gconv_close_transform (copy->towc, copy->towc_nsteps);
}
- if (copy->towc == NULL || copy->tomb == NULL)
- return 1;
+ return copy->towc == NULL || copy->tomb == NULL ? 1 : 0;
+}
- /* 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;
+/* Free all resources if necessary. */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+ if (__wcsmbs_gconv_fcts.tomb != &to_mb)
+ {
+ struct __gconv_step *old = __wcsmbs_gconv_fcts.tomb;
+ size_t nold = __wcsmbs_gconv_fcts.tomb_nsteps;
+ __wcsmbs_gconv_fcts.tomb = &to_mb;
+ __wcsmbs_gconv_fcts.tomb_nsteps = 1;
+ __gconv_release_cache (old, nold);
+ }
+
+ if (__wcsmbs_gconv_fcts.towc != &to_wc)
+ {
+ struct __gconv_step *old = __wcsmbs_gconv_fcts.towc;
+ size_t nold = __wcsmbs_gconv_fcts.towc_nsteps;
+ __wcsmbs_gconv_fcts.towc = &to_wc;
+ __wcsmbs_gconv_fcts.towc_nsteps = 1;
+ __gconv_release_cache (old, nold);
+ }
}
+
+text_set_element (__libc_subfreeres, free_mem);
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
struct gconv_fcts
{
struct __gconv_step *towc;
+ size_t towc_nsteps;
struct __gconv_step *tomb;
+ size_t tomb_nsteps;
};
/* Set of currently active conversion functions. */
projects / thirdparty / glibc.git / commitdiff
