ncurses 5.9 - patch 20110807

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

diff --git a/ncurses/tinfo/home_terminfo.c b/ncurses/tinfo/home_terminfo.c
index 7aa4ca112e5ad51a56ace2c7caed0f740edd5f1d..69d69f95bf7ca817413c1badbe5df656fab78c9b 100644 (file)
--- a/ncurses/tinfo/home_terminfo.c
+++ b/ncurses/tinfo/home_terminfo.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2008,2010 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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1998                        *
+ *  Author: Thomas E. Dickey                                                *
  ****************************************************************************/
 
 /*
@@ -37,26 +37,31 @@
 #include <curses.priv.h>
 #include <tic.h>
 
-MODULE_ID("$Id: home_terminfo.c,v 1.2 1999/02/27 19:58:46 tom Exp $")
-
-#define my_length (strlen(home) + sizeof(PRIVATE_INFO))
+MODULE_ID("$Id: home_terminfo.c,v 1.12 2010/12/25 23:43:58 tom Exp $")
 
 /* ncurses extension...fall back on user's private directory */
 
-char *
+#define MyBuffer _nc_globals.home_terminfo
+
+NCURSES_EXPORT(char *)
 _nc_home_terminfo(void)
 {
-       char *home;
-       static char *temp = 0;
-
-       if (temp == 0) {
-               if ((home = getenv("HOME")) != 0
-                && my_length <= PATH_MAX) {
-                       temp = typeMalloc(char, my_length);
-                       if (temp == 0)
-                               _nc_err_abort("Out of memory");
-                       (void) sprintf(temp, PRIVATE_INFO, home);
-               }
+    char *result = 0;
+#if USE_HOME_TERMINFO
+    char *home;
+
+    if (use_terminfo_vars()) {
+       if (MyBuffer == 0) {
+           if ((home = getenv("HOME")) != 0) {
+               size_t want = (strlen(home) + sizeof(PRIVATE_INFO));
+               MyBuffer = typeMalloc(char, want);
+               if (MyBuffer == 0)
+                   _nc_err_abort(MSG_NO_MEMORY);
+               (void) sprintf(MyBuffer, PRIVATE_INFO, home);
+           }
        }
-       return temp;
+       result = MyBuffer;
+    }
+#endif
+    return result;
 }