+1998-04-21 19:05 Ulrich Drepper <drepper@cygnus.com>
+
+ * iconv/gconv.h (struct gconv_step): Add element stateful.
+ * iconv/gconv_builtin.c (__gconv_builtin_trans): Initialize stateful
+ to zero for all internal conversions.
+ * iconv/skeleton.c: Initialize stateful depending on whether or not
+ RESET_STATE is defined to one or zero respectively.
+ * stdlib/mblen.c: Use stateful element of currently selected
+ converter for result if S is NULL.
+ * stdlib/mbtowc.c: Likewise.
+ * stdlib/wctomb.c: Likewise.
+
1998-04-21 18:00 Ulrich Drepper <drepper@cygnus.com>
* iconv/gconv.c (__gconv): Remove bogus input buffer size computation.
int min_needed_to;
int max_needed_to;
+ /* Flag whether this is a stateful encoding or not. */
+ int stateful;
+
void *data; /* Pointer to step-local data. */
};
step->max_needed_from = map[cnt].max_needed_from;
step->min_needed_to = map[cnt].min_needed_to;
step->max_needed_to = map[cnt].max_needed_to;
+
+ /* None of the builtin converters handles stateful encoding. */
+ step->stateful = 0;
}
step->min_needed_to = MIN_NEEDED_TO;
step->max_needed_to = MAX_NEEDED_TO;
+#ifdef RESET_STATE
+ step->stateful = 1;
+#else
+ step->stateful = 0;
+#endif
+
return GCONV_OK;
}
#endif
#include <stdlib.h>
#include <wchar.h>
+#include <gconv.h>
+#include <wcsmbs/wcsmbsload.h>
/* Return the length of the multibyte character (if there is one)
/* If S is NULL the function has to return null or not null
depending on the encoding having a state depending encoding or
- not. This is nonsense because any multibyte encoding has a
- state. The ISO C amendment 1 corrects this while introducing the
- restartable functions. We simply say here all encodings have a
- state. */
+ not. */
if (s == NULL)
- result = 1;
+ {
+ /* Make sure we use the correct value. */
+ update_conversion_ptrs ();
+
+ result = __wcsmbs_gconv_fcts.towc->stateful;
+ }
else if (*s == '\0')
/* According to the ISO C 89 standard this is the expected behaviour.
Idiotic, but true. */
#include <stdlib.h>
#include <wchar.h>
+#include <gconv.h>
+#include <wcsmbs/wcsmbsload.h>
/* Common state for all non-restartable conversion functions. */
/* If S is NULL the function has to return null or not null
depending on the encoding having a state depending encoding or
- not. This is nonsense because any multibyte encoding has a
- state. The ISO C amendment 1 corrects this while introducing the
- restartable functions. We simply say here all encodings have a
- state. */
+ not. */
if (s == NULL)
- result = 1;
+ {
+ /* Make sure we use the correct value. */
+ update_conversion_ptrs ();
+
+ result = __wcsmbs_gconv_fcts.towc->stateful;
+ }
else if (*s == '\0')
{
if (pwc != NULL)
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
#include <stdlib.h>
#include <wchar.h>
+#include <gconv.h>
+#include <wcsmbs/wcsmbsload.h>
extern mbstate_t __no_r_state; /* Defined in mbtowc.c. */
{
/* If S is NULL the function has to return null or not null
depending on the encoding having a state depending encoding or
- not. This is nonsense because any multibyte encoding has a
- state. The ISO C amendment 1 corrects this while introducing the
- restartable functions. We simply say here all encodings have a
- state. */
+ not. */
if (s == NULL)
- return 1;
+ {
+ /* Make sure we use the correct value. */
+ update_conversion_ptrs ();
+
+ return __wcsmbs_gconv_fcts.tomb->stateful;
+ }
return __wcrtomb (s, wchar, &__no_r_state);
}