/****************************************************************************
- * Copyright (c) 1999-2008,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1999-2010,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 *
/*
* Author: Thomas E. Dickey
*
- * $Id: cardfile.c,v 1.37 2010/05/01 22:19:02 tom Exp $
+ * $Id: cardfile.c,v 1.41 2012/11/03 19:26:50 tom Exp $
*
* File format: text beginning in column 1 is a title; other text is content.
*/
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)
static void
trim(char *buffer)
{
- unsigned n = strlen(buffer);
+ size_t n = strlen(buffer);
while (n-- && isspace(UChar(buffer[n])))
buffer[n] = 0;
}
static void
add_content(CARD * card, const char *content)
{
- unsigned total, offset;
+ size_t total, offset;
content = skip(content);
if ((total = strlen(content)) != 0) {
}
if (card->content)
strcpy(card->content + offset, content);
+ else
+ failed("add_content");
}
}
if ((win = newwin(panel_high, panel_wide, y, x)) == 0)
break;
- wbkgd(win, COLOR_PAIR(pair_2));
+ wbkgd(win, (chtype) COLOR_PAIR(pair_2));
keypad(win, TRUE);
p->panel = new_panel(win);
box(win, 0, 0);
start_color();
init_pair(pair_1, COLOR_WHITE, COLOR_BLUE);
init_pair(pair_2, COLOR_WHITE, COLOR_CYAN);
- bkgd(COLOR_PAIR(pair_1));
+ bkgd((chtype) COLOR_PAIR(pair_1));
} else {
try_color = FALSE;
}