ncurses 5.6 - patch 20070630

[ncurses.git] / ncurses / widechar / lib_unget_wch.c

diff --git a/ncurses/widechar/lib_unget_wch.c b/ncurses/widechar/lib_unget_wch.c
index f4d0c518edfd713da1421ae1dc726ca38dac3547..62ec89d750142f74d602226b4426d2322c46e922 100644 (file)
--- a/ncurses/widechar/lib_unget_wch.c
+++ b/ncurses/widechar/lib_unget_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002,2003 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,7 +39,26 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_unget_wch.c,v 1.5 2003/07/05 19:46:51 tom Exp $")
+MODULE_ID("$Id: lib_unget_wch.c,v 1.7 2004/12/05 01:21:31 tom Exp $")
+
+#ifdef linux
+/*
+ * glibc's wcrtomb() function is broken - does not return the proper value
+ * when target is null (noted for glibc 2.3.2).  This is a workaround.
+ */
+NCURSES_EXPORT(size_t)
+_nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
+{
+    if (target == 0) {
+       wchar_t temp[2];
+       const wchar_t *tempp = temp;
+       temp[0] = source;
+       temp[1] = 0;
+       return wcsrtombs(NULL, &tempp, 0, state);
+    }
+    return wcrtomb(target, source, state);
+}
+#endif
 
 NCURSES_EXPORT(int)
 unget_wch(const wchar_t wch)
@@ -51,15 +70,15 @@ unget_wch(const wchar_t wch)
 
     T((T_CALLED("unget_wch(%#lx)"), (unsigned long) wch));
 
-    memset(&state, 0, sizeof(state));
-    length = wcrtomb(0, wch, &state);
+    init_mb(state);
+    length = _nc_wcrtomb(0, wch, &state);
 
     if (length != (size_t) (-1)
        && length != 0) {
        char *string;
 
        if ((string = (char *) malloc(length)) != 0) {
-           memset(&state, 0, sizeof(state));
+           init_mb(state);
            wcrtomb(string, wch, &state);
 
            for (n = (int) (length - 1); n >= 0; --n) {