X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fwidechar%2Flib_get_wch.c;fp=ncurses%2Fwidechar%2Flib_get_wch.c;h=24300f6e5d568f06f466714e7282cc2e0a5f3d50;hp=e2a7ce55980938219dc5b4af60e95d184e16036c;hb=a8987e73ec254703634802b4f7ee30d3a485524d;hpb=46722468f47c2b77b3987729b4bcf2321cccfd01

diff --git a/ncurses/widechar/lib_get_wch.c b/ncurses/widechar/lib_get_wch.c
index e2a7ce55..24300f6e 100644
--- a/ncurses/widechar/lib_get_wch.c
+++ b/ncurses/widechar/lib_get_wch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2002,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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 2002                                           *
+ *  Author: Thomas E. Dickey 2002,2004                                      *
  ****************************************************************************/
 
 /*
@@ -39,7 +39,21 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_get_wch.c,v 1.5 2002/09/02 00:04:25 tom Exp $")
+MODULE_ID("$Id: lib_get_wch.c,v 1.6 2004/01/18 01:18:17 tom Exp $")
+
+#if HAVE_MBTOWC && HAVE_MBLEN
+#define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
+#define count_mbytes(buffer,length,state) mblen(buffer,length)
+#define check_mbytes(wch,buffer,length,state) \
+	(int) mbtowc(&wch, buffer, count)
+#elif HAVE_MBRTOWC && HAVE_MBRLEN
+#define reset_mbytes(state) memset(&state, 0, sizeof(state))
+#define count_mbytes(buffer,length,state) mbrlen(buffer,length,&state)
+#define check_mbytes(wch,buffer,length,state) \
+	(int) mbrtowc(&wch, buffer, count, &state)
+#else
+make an error
+#endif
 
 NCURSES_EXPORT(int)
 wget_wch(WINDOW *win, wint_t * result)
@@ -53,6 +67,8 @@ wget_wch(WINDOW *win, wint_t * result)
     wchar_t wch;
 
     T((T_CALLED("wget_wch(%p)"), win));
+    (void) state;
+
     /*
      * We can get a stream of single-byte characters and KEY_xxx codes from
      * _nc_wgetch(), while we want to return a wide character or KEY_xxx code.
@@ -81,11 +97,11 @@ wget_wch(WINDOW *win, wint_t * result)
 	    break;
 	} else {
 	    buffer[count++] = UChar(value);
-	    memset(&state, 0, sizeof(state));
-	    status = mbrlen(buffer, count, &state);
+	    reset_mbytes(state);
+	    status = count_mbytes(buffer, count, state);
 	    if (status >= 0) {
-		memset(&state, 0, sizeof(state));
-		if ((int) mbrtowc(&wch, buffer, count, &state) != status) {
+		reset_mbytes(state);
+		if (check_mbytes(wch, buffer, count, state) != status) {
 		    code = ERR;	/* the two calls should match */
 		}
 		value = wch;