ncurses 6.0 - patch 20171021

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

diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
index 75dbf4a521a2c1cab1f5f63ab5479f7a288aca86..b465c36089a159c753fbc6271135c9b758d43d98 100644 (file)
--- a/ncurses/widechar/lib_cchar.c
+++ b/ncurses/widechar/lib_cchar.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2016,2017 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,29 +35,39 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_cchar.c,v 1.8 2003/05/25 00:07:41 tom Exp $")
+MODULE_ID("$Id: lib_cchar.c,v 1.31 2017/03/31 11:14:26 tom Exp $")
 
 /* 
  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
- * is L'\0' terminated, contains at most one character with strictly positive
- * width, which must be the first, and contains no characters of negative
- * width.
+ * points to a string which is L'\0' terminated, contains at least one
+ * character with strictly positive width, which must be the first, and
+ * contains no characters of negative width.
  */
 NCURSES_EXPORT(int)
-setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
-        short color_pair, const void *opts)
+setcchar(cchar_t *wcval,
+        const wchar_t *wch,
+        const attr_t attrs,
+        NCURSES_PAIRS_T pair_arg,
+        const void *opts)
 {
-    int i;
-    int len;
     int code = OK;
+    int color_pair = pair_arg;
+    unsigned len;
 
-    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%ld,%d,%p)"),
-                     wcval, _nc_viswbuf(wch), attrs, color_pair, opts));
+    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
+                     (void *) wcval, _nc_viswbuf(wch),
+                     (unsigned long) attrs, color_pair, opts));
 
-    if (opts != NULL || (len = wcslen(wch)) > CCHARW_MAX
-       || (len > 1 && wcwidth(wch[0]) < 0)) {
+    set_extended_pair(opts, color_pair);
+    if (wch == NULL
+       || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)
+       || color_pair < 0) {
        code = ERR;
     } else {
+       unsigned i;
+
+       if (len > CCHARW_MAX)
+           len = CCHARW_MAX;
 
        /*
         * If we have a following spacing-character, stop at that point.  We
@@ -73,7 +83,8 @@ setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
        memset(wcval, 0, sizeof(*wcval));
 
        if (len != 0) {
-           SetAttr(*wcval, attrs | 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,
                              _tracecchar_t(wcval)));
@@ -85,31 +96,47 @@ setcchar(cchar_t * wcval, const wchar_t * wch, const attr_t attrs,
 }
 
 NCURSES_EXPORT(int)
-getcchar(const cchar_t * wcval, wchar_t * wch, attr_t * attrs,
-        short *color_pair, void *opts)
+getcchar(const cchar_t *wcval,
+        wchar_t *wch,
+        attr_t *attrs,
+        NCURSES_PAIRS_T *pair_arg,
+        void *opts)
 {
-    wchar_t *wp;
-    int len;
     int code = ERR;
+    int color_pair;
 
     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 *) pair_arg,
+                     opts));
+
+    if (opts == NULL && wcval != NULL) {
+       wchar_t *wp;
+       int len;
 
-    if (opts == NULL) {
-       len = (wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX))
-           ? wp - wcval->chars
-           : CCHARW_MAX;
+       len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX))
+              ? (int) (wp - wcval->chars)
+              : CCHARW_MAX);
 
        if (wch == NULL) {
-           code = len;
-       } else if (attrs == 0 || color_pair == 0) {
+           /*
+            * If the value is a null, set the length to 1.
+            * If the value is not a null, return the length plus 1 for null.
+            */
+           code = (len < CCHARW_MAX) ? (len + 1) : CCHARW_MAX;
+       } else if (attrs == 0 || pair_arg == 0) {
            code = ERR;
        } else if (len >= 0) {
-           *attrs = AttrOf(*wcval);
-           *color_pair = AttrOf(*wcval) & A_COLOR;
-           wmemcpy(wch, wcval->chars, (unsigned) len);
+           *attrs = AttrOf(*wcval) & A_ATTRIBUTES;
+           color_pair = GetPair(*wcval);
+           get_extended_pair(opts, color_pair);
+           *pair_arg = limit_PAIRS(color_pair);
+           wmemcpy(wch, wcval->chars, (size_t) len);
            wch[len] = L'\0';
-           code = OK;
+           if (*pair_arg >= 0)
+               code = OK;
        }
     }