ncurses 6.0 - patch 20170617

[ncurses.git] / ncurses / tinfo / MKfallback.sh

diff --git a/ncurses/tinfo/MKfallback.sh b/ncurses/tinfo/MKfallback.sh
index 9feab3507cc0ecb288dc261b8953fcdfe6c94a26..4c4f39844d315faeb5bc680d453a1e0ee19b4359 100755 (executable)
--- a/ncurses/tinfo/MKfallback.sh
+++ b/ncurses/tinfo/MKfallback.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##############################################################################
-# Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-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 "Software"), #
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKfallback.sh,v 1.13 2006/07/15 16:54:20 tom Exp $
+# $Id: MKfallback.sh,v 1.21 2017/04/12 00:50:50 tom Exp $
 #
 # MKfallback.sh -- create fallback table for entry reads
 #
@@ -42,6 +42,17 @@ shift
 terminfo_src=$1
 shift
 
+tic_path=$1
+shift
+
+case $tic_path in #(vi
+/*)
+       tic_head=`echo "$tic_path" | sed -e 's,/[^/]*$,,'`
+       PATH=$tic_head:$PATH
+       export PATH
+       ;;
+esac
+
 if test $# != 0 ; then
        tmp_info=tmp_info
        echo creating temporary terminfo directory... >&2
@@ -52,18 +63,19 @@ if test $# != 0 ; then
        TERMINFO_DIRS=$TERMINFO:$terminfo_dir
        export TERMINFO_DIRS
 
-       tic -x $terminfo_src >&2
+       $tic_path -x $terminfo_src >&2
 else
        tmp_info=
 fi
 
 cat <<EOF
+/* This file was generated by $0 */
+
 /*
- * DO NOT EDIT THIS FILE BY HAND!  It is generated by MKfallback.sh.
+ * DO NOT EDIT THIS FILE BY HAND!
  */
 
 #include <curses.priv.h>
-#include <term.h>
 
 EOF
 
@@ -77,11 +89,11 @@ EOF
        for x in $*
        do
                echo "/* $x */"
-               infocmp -E $x
+               infocmp -E $x | sed -e 's/\<short\>/NCURSES_INT2/g'
        done
 
        cat <<EOF
-static const TERMTYPE fallbacks[$#] =
+static const TERMTYPE2 fallbacks[$#] =
 {
 EOF
        comma=""
@@ -99,28 +111,51 @@ EOF
 fi
 
 cat <<EOF
-NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *name GCC_UNUSED)
+NCURSES_EXPORT(const TERMTYPE2 *)
+_nc_fallback2 (const char *name GCC_UNUSED)
 {
 EOF
 
 if [ "$*" ]
 then
        cat <<EOF
-    const TERMTYPE     *tp;
+    const TERMTYPE2    *tp;
 
     for (tp = fallbacks;
-               tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE);
-               tp++)
-       if (_nc_name_match(tp->term_names, name, "|"))
+        tp < fallbacks + sizeof(fallbacks)/sizeof(TERMTYPE2);
+        tp++) {
+       if (_nc_name_match(tp->term_names, name, "|")) {
            return(tp);
+       }
+    }
 EOF
 else
        echo "  /* the fallback list is empty */";
 fi
 
 cat <<EOF
-       return((TERMTYPE *)0);
+    return((const TERMTYPE2 *)0);
+}
+
+#if NCURSES_EXT_NUMBERS
+#undef _nc_fallback
+
+/*
+ * This entrypoint is used by tack.
+ */
+NCURSES_EXPORT(const TERMTYPE *)
+_nc_fallback (const char *name)
+{
+    const TERMTYPE2 *tp = _nc_fallback2(name);
+    const TERMTYPE *result = 0;
+    if (tp != 0) {
+       static TERMTYPE temp;
+       _nc_export_termtype2(&temp, tp);
+       result = &temp;
+    }
+    return result;
 }
+#endif
 EOF
 
 if test -n "$tmp_info" ; then