ncurses 5.9 - patch 20120303

[ncurses.git] / ncurses / base / lib_addstr.c

diff --git a/ncurses/base/lib_addstr.c b/ncurses/base/lib_addstr.c
index 7428f5206278faf1e37e519edb9e024a103f1ddb..a1a55cb8bfd8b9bfa88ec7e11202beedfeb802b0 100644 (file)
--- a/ncurses/base/lib_addstr.c
+++ b/ncurses/base/lib_addstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -44,7 +44,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_addstr.c,v 1.47 2007/04/07 17:13:21 tom Exp $")
+MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $")

 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)
 
 NCURSES_EXPORT(int)
 waddnstr(WINDOW *win, const char *astr, int n)


@@ -52,7 +52,7 @@ waddnstr(WINDOW *win, const char *astr, int n)
     const char *str = astr;
     int code = ERR;
 
     const char *str = astr;
     int code = ERR;
 

-    T((T_CALLED("waddnstr(%p,%s,%d)"), win, _nc_visbufn(astr, n), n));
+    T((T_CALLED("waddnstr(%p,%s,%d)"), (void *) win, _nc_visbufn(astr, n), n));

 
     if (win && (str != 0)) {
        TR(TRACE_VIRTPUT | TRACE_ATTRS,
 
     if (win && (str != 0)) {
        TR(TRACE_VIRTPUT | TRACE_ATTRS,


@@ -85,7 +85,7 @@ waddchnstr(WINDOW *win, const chtype *astr, int n)
     int i;
     struct ldat *line;
 
     int i;
     struct ldat *line;
 

-    T((T_CALLED("waddchnstr(%p,%p,%d)"), win, astr, n));
+    T((T_CALLED("waddchnstr(%p,%p,%d)"), (void *) win, (const void *) astr, n));

 
     if (!win)
        returnCode(ERR);
 
     if (!win)
        returnCode(ERR);


@@ -107,7 +107,7 @@ waddchnstr(WINDOW *win, const chtype *astr, int n)
     for (i = 0; i < n && ChCharOf(astr[i]) != '\0'; ++i) {
        SetChar2(line->text[i + x], astr[i]);
     }
     for (i = 0; i < n && ChCharOf(astr[i]) != '\0'; ++i) {
        SetChar2(line->text[i + x], astr[i]);
     }

-    CHANGED_RANGE(line, x, x + n - 1);
+    CHANGED_RANGE(line, x, (NCURSES_SIZE_T) (x + n - 1));

 
     _nc_synchook(win);
     returnCode(code);
 
     _nc_synchook(win);
     returnCode(code);


@@ -119,8 +119,10 @@ NCURSES_EXPORT(int)
 _nc_wchstrlen(const cchar_t *s)
 {
     int result = 0;
 _nc_wchstrlen(const cchar_t *s)
 {
     int result = 0;

-    while (CharOf(s[result]) != L'\0') {
-       result++;
+    if (s != 0) {
+       while (CharOf(s[result]) != L'\0') {
+           result++;
+       }

     }
     return result;
 }
     }
     return result;
 }


@@ -129,17 +131,22 @@ NCURSES_EXPORT(int)
 wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
 {
     static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
 wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
 {
     static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);

-    NCURSES_SIZE_T y = win->_cury;
-    NCURSES_SIZE_T x = win->_curx;
+    NCURSES_SIZE_T y;
+    NCURSES_SIZE_T x;

     int code = OK;
     struct ldat *line;
     int i, j, start, len, end;
 
     int code = OK;
     struct ldat *line;
     int i, j, start, len, end;
 

-    T((T_CALLED("wadd_wchnstr(%p,%s,%d)"), win, _nc_viscbuf(astr, n), n));
+    T((T_CALLED("wadd_wchnstr(%p,%s,%d)"),
+       (void *) win,
+       _nc_viscbuf(astr, n),
+       n));

 
     if (!win)
        returnCode(ERR);
 
 
     if (!win)
        returnCode(ERR);
 

+    y = win->_cury;
+    x = win->_curx;

     if (n < 0) {
        n = _nc_wchstrlen(astr);
     }
     if (n < 0) {
        n = _nc_wchstrlen(astr);
     }


@@ -188,7 +195,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
                    SetWidecExt(line->text[x + j], j);
                }
            }
                    SetWidecExt(line->text[x + j], j);
                }
            }

-           x += len;
+           x = (NCURSES_SIZE_T) (x + len);

            end += len - 1;
        } else {
            break;
            end += len - 1;
        } else {
            break;


@@ -215,7 +222,7 @@ waddnwstr(WINDOW *win, const wchar_t *str, int n)
 {
     int code = ERR;
 
 {
     int code = ERR;
 

-    T((T_CALLED("waddnwstr(%p,%s,%d)"), win, _nc_viswbufn(str, n), n));
+    T((T_CALLED("waddnwstr(%p,%s,%d)"), (void *) win, _nc_viswbufn(str, n), n));

 
     if (win && (str != 0)) {
        TR(TRACE_VIRTPUT | TRACE_ATTRS,
 
     if (win && (str != 0)) {
        TR(TRACE_VIRTPUT | TRACE_ATTRS,