X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fcardfile.c;h=dc87841301ecb9386924af57098126c50814942b;hp=2985b2ed8f261718bc9fb83a29c8c4e35b913d52;hb=920d493ac02ed9bbbe1e5472e665c718bfdee471;hpb=0be808514502f3149b379d036ab3a83cbb4d4c02

diff --git a/test/cardfile.c b/test/cardfile.c
index 2985b2ed..dc878413 100644
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: cardfile.c,v 1.29 2007/03/10 19:16:45 tom Exp $
+ * $Id: cardfile.c,v 1.32 2007/08/11 16:34:27 tom Exp $
  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
@@ -71,7 +71,7 @@ static char default_name[] = "cardfile.dat";
 #if !HAVE_STRDUP
 #define strdup my_strdup
 static char *
-strdup(char *s)
+strdup(const char *s)
 {
     char *p = (char *) malloc(strlen(s) + 1);
     if (p)
@@ -136,13 +136,15 @@ add_content(CARD * card, const char *content)
 	if ((offset = strlen(card->content)) != 0) {
 	    total += 1 + offset;
 	    card->content = (char *) realloc(card->content, total + 1);
-	    strcpy(card->content + offset++, " ");
+	    if (card->content)
+		strcpy(card->content + offset++, " ");
 	} else {
 	    if (card->content != 0)
 		free(card->content);
 	    card->content = (char *) malloc(total + 1);
 	}
-	strcpy(card->content + offset, content);
+	if (card->content)
+	    strcpy(card->content + offset, content);
     }
 }
 
@@ -568,7 +570,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((n = getopt(argc, argv, "c")) != EOF) {
+    while ((n = getopt(argc, argv, "c")) != -1) {
 	switch (n) {
 	case 'c':
 	    try_color = TRUE;