ncurses 5.9 - patch 20130831

[ncurses.git] / ncurses / tinfo / read_termcap.c

diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index ba6e87dd745b105ef094dd81eea838d1332289e4..05e57df2b2810ffdfee278eedbc7296e330c0704 100644 (file)
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2013 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            *


@@ -56,7 +56,7 @@
 #include <sys/types.h>
 #include <tic.h>
 
 #include <sys/types.h>
 #include <tic.h>
 

-MODULE_ID("$Id: read_termcap.c,v 1.86 2012/02/22 22:40:24 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.88 2013/07/13 22:11:06 tom Exp $")

 
 #if !PURE_TERMINFO
 
 
 #if !PURE_TERMINFO
 


@@ -791,13 +791,11 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name)
     int i;
     char pathbuf[PBUFSIZ];     /* holds raw path of filenames */
     CGETENT_CONST char *pathvec[PVECSIZ];      /* point to names in pathbuf */
     int i;
     char pathbuf[PBUFSIZ];     /* holds raw path of filenames */
     CGETENT_CONST char *pathvec[PVECSIZ];      /* point to names in pathbuf */

-    CGETENT_CONST char **pvec; /* holds usable tail of path vector */

     NCURSES_CONST char *termpath;
     string_desc desc;
 
     *lineno = 1;
     fname = pathvec;
     NCURSES_CONST char *termpath;
     string_desc desc;
 
     *lineno = 1;
     fname = pathvec;

-    pvec = pathvec;

     p = pathbuf;
     cp = use_terminfo_vars()? getenv("TERMCAP") : NULL;
 
     p = pathbuf;
     cp = use_terminfo_vars()? getenv("TERMCAP") : NULL;
 


@@ -1156,8 +1154,7 @@ _nc_read_termcap_entry(const char *const tn, TERMTYPE *const tp)
                 * from the list.
                 */
                *tp = ep->tterm;
                 * from the list.
                 */
                *tp = ep->tterm;

-               _nc_delink_entry(_nc_head, &(ep->tterm));
-               free(ep);
+               _nc_free_entry(_nc_head, &(ep->tterm));

 
                /*
                 * OK, now try to write the type to user's terminfo directory. 
 
                /*
                 * OK, now try to write the type to user's terminfo directory.