/****************************************************************************
- * 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 *
/*
* 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.
*/
#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)
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);
}
}
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:
int y;
int x;
int ch = ERR;
- int last_ch;
int finished = FALSE;
show_legend();
update_panels();
doupdate();
- last_ch = ch;
ch = form_virtualize(panel_window(top_card->panel));
switch (form_driver(top_card->form, ch)) {
case E_OK:
setlocale(LC_ALL, "");
- while ((n = getopt(argc, argv, "c")) != EOF) {
+ while ((n = getopt(argc, argv, "c")) != -1) {
switch (n) {
case 'c':
try_color = TRUE;