X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fcardfile.c;h=dc87841301ecb9386924af57098126c50814942b;hp=318342f0783b4bfbdafe7e5202497e690695a1b5;hb=25358bc041a5566ce2de4c9c792837e552b35671;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8

diff --git a/test/cardfile.c b/test/cardfile.c
index 318342f0..dc878413 100644
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2006,2007 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.27 2004/11/06 19:33:39 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);
     }
 }
 
@@ -306,8 +308,8 @@ form_virtualize(WINDOW *w)
 	return (MY_CTRL_N);
     case CTRL('P'):
 	return (MY_CTRL_P);
-    case CTRL('Q'):
-    case 033:
+    case QUIT:
+    case ESCAPE:
 	return (MY_CTRL_Q);
 
     case KEY_BACKSPACE:
@@ -389,7 +391,6 @@ cardfile(char *fname)
     int y;
     int x;
     int ch = ERR;
-    int last_ch;
     int finished = FALSE;
 
     show_legend();
@@ -433,7 +434,6 @@ cardfile(char *fname)
 	update_panels();
 	doupdate();
 
-	last_ch = ch;
 	ch = form_virtualize(panel_window(top_card->panel));
 	switch (form_driver(top_card->form, ch)) {
 	case E_OK:
@@ -570,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;