ncurses 5.9 - patch 20121201

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

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 28413f432f4a64b66332f1527fc325caa12b5579..679dd7171626eb8447c9acd98f1011c6b968a00e 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2011,2012 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            *
@@ -35,7 +35,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.14 2009/07/18 15:20:42 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.26 2012/03/24 18:37:17 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
@@ -55,12 +55,12 @@ setcchar(cchar_t *wcval,
     int code = OK;
 
     TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
-                     wcval, _nc_viswbuf(wch),
+                     (void *) wcval, _nc_viswbuf(wch),
                      (unsigned long) attrs, color_pair, opts));
 
-    len = wcslen(wch);
     if (opts != NULL
-       || (len > 1 && wcwidth(wch[0]) < 0)) {
+       || wch == NULL
+       || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
        code = ERR;
     } else {
        if (len > CCHARW_MAX)
@@ -80,7 +80,7 @@ setcchar(cchar_t *wcval,
        memset(wcval, 0, sizeof(*wcval));
 
        if (len != 0) {
-           SetAttr(*wcval, attrs | COLOR_PAIR(color_pair));
+           SetAttr(*wcval, attrs);
            SetPair(CHDEREF(wcval), color_pair);
            memcpy(&wcval->chars, wch, len * sizeof(wchar_t));
            TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len,
@@ -104,12 +104,16 @@ getcchar(const cchar_t *wcval,
     int code = ERR;
 
     TR(TRACE_CCALLS, (T_CALLED("getcchar(%p,%p,%p,%p,%p)"),
-                     wcval, wch, attrs, color_pair, opts));
+                     (const void *) wcval,
+                     (void *) wch,
+                     (void *) attrs,
+                     (void *) color_pair,
+                     opts));
 
-    if (opts == NULL) {
-       len = (wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
-           ? wp - wcval->chars
-           : CCHARW_MAX;
+    if (opts == NULL && wcval != NULL) {
+       len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX))
+              ? (int) (wp - wcval->chars)
+              : CCHARW_MAX);
 
        if (wch == NULL) {
            /*
@@ -121,8 +125,8 @@ getcchar(const cchar_t *wcval,
            code = ERR;
        } else if (len >= 0) {
            *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
-           *color_pair = GetPair(*wcval);
-           wmemcpy(wch, wcval->chars, (unsigned) len);
+           *color_pair = (short) GetPair(*wcval);
+           wmemcpy(wch, wcval->chars, (size_t) len);
            wch[len] = L'\0';
            code = OK;
        }