ncurses 6.1 - patch 20180303

[ncurses.git] / test / cardfile.c

diff --git a/test/cardfile.c b/test/cardfile.c
index 2985b2ed8f261718bc9fb83a29c8c4e35b913d52..ba9e8de53bae1f8b2eff2c0485247f9dc849e37c 100644 (file)
--- a/test/cardfile.c
+++ b/test/cardfile.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2016,2017 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            *
  *                                                                          *
  * 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
  *
 /*
  * Author: Thomas E. Dickey
  *

- * $Id: cardfile.c,v 1.29 2007/03/10 19:16:45 tom Exp $
+ * $Id: cardfile.c,v 1.45 2017/10/19 21:14:25 tom Exp $

  *
  * File format: text beginning in column 1 is a title; other text is content.
  */
  *
  * 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";
 
 static bool try_color = FALSE;
 static char default_name[] = "cardfile.dat";
 

-#if !HAVE_STRDUP
-#define strdup my_strdup
-static char *
-strdup(char *s)
+static void
+failed(const char *s)

 {
 {

-    char *p = (char *) malloc(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 const char *
 skip(const char *buffer)


@@ -91,7 +87,7 @@ skip(const char *buffer)
 static void
 trim(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;
 }
     while (n-- && isspace(UChar(buffer[n])))
        buffer[n] = 0;
 }


@@ -111,7 +107,7 @@ add_title(const char *title)
            break;
     }
 
            break;
     }
 

-    card = (CARD *) calloc(1, sizeof(CARD));
+    card = typeCalloc(CARD, (size_t) 1);

     card->title = strdup(title);
     card->content = strdup("");
 
     card->title = strdup(title);
     card->content = strdup("");
 


@@ -129,20 +125,27 @@ add_title(const char *title)
 static void
 add_content(CARD * card, const char *content)
 {
 static void
 add_content(CARD * card, const char *content)
 {

-    unsigned total, offset;
+    size_t total, offset;

 
     content = skip(content);
     if ((total = strlen(content)) != 0) {
 
     content = skip(content);
     if ((total = strlen(content)) != 0) {

-       if ((offset = strlen(card->content)) != 0) {
+       if (card->content != 0 && (offset = strlen(card->content)) != 0) {

            total += 1 + offset;
            total += 1 + offset;

-           card->content = (char *) realloc(card->content, total + 1);
-           strcpy(card->content + offset++, " ");
+           card->content = typeRealloc(char, total + 1, card->content);
+           if (card->content) {
+               _nc_STRCPY(card->content + offset, " ", total + 1 - offset);
+               offset++;
+           }

        } else {
        } else {

+           offset = 0;

            if (card->content != 0)
                free(card->content);
            if (card->content != 0)
                free(card->content);

-           card->content = (char *) malloc(total + 1);
+           card->content = typeMalloc(char, total + 1);

        }
        }

-       strcpy(card->content + offset, content);
+       if (card->content)
+           _nc_STRCPY(card->content + offset, content, total + 1 - offset);
+       else
+           failed("add_content");

     }
 }
 
     }
 }
 


@@ -259,7 +262,7 @@ next_card(CARD * now)
        if (isVisible(tst))
            now = tst;
        else
        if (isVisible(tst))
            now = tst;
        else

-           tst = next_card(tst);
+           (void) next_card(tst);

     }
     return now;
 }
     }
     return now;
 }


@@ -334,7 +337,7 @@ form_virtualize(WINDOW *w)
 static FIELD **
 make_fields(CARD * p, int form_high, int form_wide)
 {
 static FIELD **
 make_fields(CARD * p, int form_high, int form_wide)
 {

-    FIELD **f = (FIELD **) calloc(3, sizeof(FIELD *));
+    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);
 
     f[0] = new_field(1, form_wide, 0, 0, 0, 0);
     set_field_back(f[0], A_REVERSE);


@@ -411,7 +414,7 @@ cardfile(char *fname)
        if ((win = newwin(panel_high, panel_wide, y, x)) == 0)
            break;
 
        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);
        keypad(win, TRUE);
        p->panel = new_panel(win);
        box(win, 0, 0);


@@ -520,14 +523,12 @@ cardfile(char *fname)
 #if NO_LEAKS
     while (all_cards != 0) {
        FIELD **f;
 #if NO_LEAKS
     while (all_cards != 0) {
        FIELD **f;

-       int count;

 
        p = all_cards;
        all_cards = all_cards->link;
 
        if (isVisible(p)) {
            f = form_fields(p->form);
 
        p = all_cards;
        all_cards = all_cards->link;
 
        if (isVisible(p)) {
            f = form_fields(p->form);

-           count = field_count(p->form);

 
            unpost_form(p->form);       /* ...so we can free it */
            free_form(p->form); /* this also disconnects the fields */
 
            unpost_form(p->form);       /* ...so we can free it */
            free_form(p->form); /* this also disconnects the fields */


@@ -548,7 +549,7 @@ usage(void)
 {
     static const char *msg[] =
     {
 {
     static const char *msg[] =
     {

-       "Usage: view [options] file"
+       "Usage: cardfile [options] file"

        ,""
        ,"Options:"
        ," -c       use color if terminal supports it"
        ,""
        ,"Options:"
        ," -c       use color if terminal supports it"


@@ -568,7 +569,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
 
     setlocale(LC_ALL, "");
 

-    while ((n = getopt(argc, argv, "c")) != EOF) {
+    while ((n = getopt(argc, argv, "c")) != -1) {

        switch (n) {
        case 'c':
            try_color = TRUE;
        switch (n) {
        case 'c':
            try_color = TRUE;


@@ -587,7 +588,7 @@ main(int argc, char *argv[])
            start_color();
            init_pair(pair_1, COLOR_WHITE, COLOR_BLUE);
            init_pair(pair_2, COLOR_WHITE, COLOR_CYAN);
            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;
        }
        } else {
            try_color = FALSE;
        }