ncurses 6.0 - patch 20150725

[ncurses.git] / ncurses / tinfo / strings.c

diff --git a/ncurses/tinfo/strings.c b/ncurses/tinfo/strings.c
index d5377fe07a51bb2f2775e5c67a6f150fa43b1ff2..393d8e7cab3e4b6e968cc395aec3cf67ec8b2a50 100644 (file)
--- a/ncurses/tinfo/strings.c
+++ b/ncurses/tinfo/strings.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000,2003 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2000-2007,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            *
@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: strings.c,v 1.5 2003/08/16 23:46:00 tom Exp $")
+MODULE_ID("$Id: strings.c,v 1.8 2012/02/22 22:34:31 tom Exp $")
 
 /****************************************************************************
  * Useful string functions (especially for mvcur)
@@ -52,7 +52,7 @@ _nc_strstr(const char *haystack, const char *needle)
 
     while ((len1 != 0) && (len1-- >= len2)) {
        if (!strncmp(haystack, needle, len2)) {
-           result = haystack;
+           result = (char *) haystack;
            break;
        }
        haystack++;
@@ -110,7 +110,7 @@ _nc_safe_strcat(string_desc * dst, const char *src)
 
        if (len < dst->s_size) {
            if (dst->s_tail != 0) {
-               strcpy(dst->s_tail, src);
+               _nc_STRCPY(dst->s_tail, src, dst->s_size);
                dst->s_tail += len;
            }
            dst->s_size -= len;
@@ -131,7 +131,7 @@ _nc_safe_strcpy(string_desc * dst, const char *src)
 
        if (len < dst->s_size) {
            if (dst->s_head != 0) {
-               strcpy(dst->s_head, src);
+               _nc_STRCPY(dst->s_head, src, dst->s_size);
                dst->s_tail = dst->s_head + len;
            }
            dst->s_size = dst->s_init - len;