Changeset 1020 for trunk/src

Timestamp:

Jan 23, 2004, 3:02:30 AM (22 years ago)

Author:

bird

Message:

Fix from nickk with some additions of my own. Handles the reset/init call.

Location:

trunk/src/emx/src

Files:

• lib/iconv/iconv.c (modified) (2 diffs, 1 prop)
• libiconv/iconv.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/iconv/iconv.c

@@ -77 +77 @@
        char **out, size_t *out_left)
 {
-  int rc;
-  size_t sl = *in_left, nonid;
-  UniChar *ucs = (UniChar *) alloca (sl * sizeof (UniChar));
-  UniChar *orig_ucs = ucs;
-  size_t retval = 0;
+  int       rc;
+  size_t    sl;
+  size_t    nonid;
+  UniChar  *ucs;
+  UniChar  *orig_ucs;
+  size_t    retval = 0;
   FS_VAR();
+
+  /* just in case. */
+  if (!conv || conv == (iconv_t)-1)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* The caller wish to initate the conversion state and/or write initial
+     shift prefix (or something like that) to the output buffer. */
+  if (!in || !*in)
+    {
+      if (!out || !*out || !out_left || !*out_left)
+        /* do nothing since we don't have any shift state in the iconv_t. */
+        return 0;
+
+      /** @todo We don't have any shift state I or so, so what to do now?
+       *        Let's do nothing till we have anyone complaining about his DBCS
+       *        stuff not working 100%, and accept patches for that guy.
+       *        Perhaps try call UniUconvFromUcs(conv->to, and some empty input buffer or so...
+       */
+      return 0;
+    }
+
+  sl =  *in_left;
+  ucs = (UniChar *) alloca (sl * sizeof (UniChar));
+  orig_ucs = ucs;
 
   FS_SAVE_LOAD();
@@ -142 +170 @@
 iconv_close (iconv_t conv)
 {
-  if (conv != (iconv_t)(-1))
+  if (!conv && conv != (iconv_t)(-1))
     {
       FS_VAR();

trunk/src/emx/src/libiconv/iconv.c

@@ -77 +77 @@
        char **out, size_t *out_left)
 {
-  int rc;
-  size_t sl = *in_left, nonid;
-  UniChar *ucs = (UniChar *) alloca (sl * sizeof (UniChar));
-  UniChar *orig_ucs = ucs;
-  size_t retval = 0;
+  int       rc;
+  size_t    sl;
+  size_t    nonid;
+  UniChar  *ucs;
+  UniChar  *orig_ucs;
+  size_t    retval = 0;
   FS_VAR();
+
+  /* just in case. */
+  if (!conv || conv == (iconv_t)-1)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* The caller wish to initate the conversion state and/or write initial
+     shift prefix (or something like that) to the output buffer. */
+  if (!in || !*in)
+    {
+      if (!out || !*out || !out_left || !*out_left)
+        /* do nothing since we don't have any shift state in the iconv_t. */
+        return 0;
+
+      /** @todo We don't have any shift state I or so, so what to do now?
+       *        Let's do nothing till we have anyone complaining about his DBCS
+       *        stuff not working 100%, and accept patches for that guy.
+       *        Perhaps try call UniUconvFromUcs(conv->to, and some empty input buffer or so...
+       */
+      return 0;
+    }
+
+  sl =  *in_left;
+  ucs = (UniChar *) alloca (sl * sizeof (UniChar));
+  orig_ucs = ucs;
 
   FS_SAVE_LOAD();
@@ -142 +170 @@
 iconv_close (iconv_t conv)
 {
-  if (conv != (iconv_t)(-1))
+  if (!conv && conv != (iconv_t)(-1))
     {
       FS_VAR();