ncurses 6.0 - patch 20170729

[ncurses.git] / test / cardfile.c

diff --git a/test/cardfile.c b/test/cardfile.c
index c549659b493ad569fb7795ea2e8defb4add3e9a2..15d532e800114322fbb76502d50a29614bb47cf8 100644 (file)
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2013,2016 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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.39 2012/06/09 20:30:32 tom Exp $
+ * $Id: cardfile.c,v 1.43 2016/09/10 21:36:46 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -68,17 +68,13 @@ static CARD *all_cards;
 static bool try_color = FALSE;
 static char default_name[] = "cardfile.dat";
 
-#if !HAVE_STRDUP
-#define strdup my_strdup
-static char *
-strdup(const char *s)
+static void
+failed(const char *s)
 {
-    char *p = typeMalloc(char, strlen(s) + 1);
-    if (p)
-       strcpy(p, s);
-    return (p);
+    perror(s);
+    endwin();
+    ExitProgram(EXIT_FAILURE);
 }
-#endif /* not HAVE_STRDUP */
 
 static const char *
 skip(const char *buffer)
@@ -111,7 +107,7 @@ add_title(const char *title)
            break;
     }
 
-    card = typeCalloc(CARD, 1);
+    card = typeCalloc(CARD, (size_t) 1);
     card->title = strdup(title);
     card->content = strdup("");
 
@@ -136,8 +132,10 @@ add_content(CARD * card, const char *content)
        if (card->content != 0 && (offset = strlen(card->content)) != 0) {
            total += 1 + offset;
            card->content = typeRealloc(char, total + 1, card->content);
-           if (card->content)
-               strcpy(card->content + offset++, " ");
+           if (card->content) {
+               _nc_STRCPY(card->content + offset, " ", total + 1 - offset);
+               offset++;
+           }
        } else {
            offset = 0;
            if (card->content != 0)
@@ -145,7 +143,9 @@ add_content(CARD * card, const char *content)
            card->content = typeMalloc(char, total + 1);
        }
        if (card->content)
-           strcpy(card->content + offset, content);
+           _nc_STRCPY(card->content + offset, content, total + 1 - offset);
+       else
+           failed("add_content");
     }
 }
 
@@ -337,7 +337,7 @@ form_virtualize(WINDOW *w)
 static FIELD **
 make_fields(CARD * p, int form_high, int form_wide)
 {
-    FIELD **f = typeCalloc(FIELD *, 3);
+    FIELD **f = typeCalloc(FIELD *, (size_t) 3);
 
     f[0] = new_field(1, form_wide, 0, 0, 0, 0);
     set_field_back(f[0], A_REVERSE);