X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Ftty%2FMKexpanded.sh;h=77f06f287ae1edc1deb5a11252363c3a146d51e4;hb=9f479192e3ca3413d235c66bf058f8cc63764898;hp=c7741ae7ce210335b18f275674c7873a9a7cb16b;hpb=5b7f4de105080e2a715b0564ede4bb7eb6767659;p=ncurses.git

diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index c7741ae7..77f06f28 100755
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,7 @@
 #! /bin/sh
 ##############################################################################
-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
+# Copyright 1998-2015,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"), #
@@ -29,7 +30,7 @@
 #
 # Author: Thomas E. Dickey, 1997-on
 #
-# $Id: MKexpanded.sh,v 1.16 2009/07/04 16:45:03 tom Exp $
+# $Id: MKexpanded.sh,v 1.23 2021/06/17 21:26:02 tom Exp $
 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,
@@ -48,13 +49,12 @@ else
 fi
 
 TMP=gen$$.c
-trap "rm -f $TMP" 0 1 2 5 15
+trap "rm -f $TMP" EXIT INT QUIT TERM HUP
 
 cat <<EOF
 /* generated by MKexpanded.sh */
 #define NEED_NCURSES_CH_T 1
 #include <curses.priv.h>
-#include <term.h>
 
 #ifndef CUR
 #define CUR SP_TERMTYPE
@@ -81,7 +81,7 @@ _nc_toggle_attr_on (attr_t *S, attr_t at)
 }
 
 NCURSES_EXPORT(void)
-_nc_toggle_attr_off (attr_t *S, attr_t at) 
+_nc_toggle_attr_off (attr_t *S, attr_t at)
 {
 	toggle_attr_off(*S,at);
 }
@@ -126,7 +126,7 @@ _nc_UpdateAttrs (CARG_CH_T c)
 EOF
 
 $preprocessor $TMP 2>/dev/null | \
-	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#if_/#if /'
+	sed -e '1,/^IGNORE$/d' -e 's/^@/#/' -e 's/^#[ 	]*if_/#if /' -e "s,$TMP,expanded.c,"
 
 cat <<EOF
 #else /* ! NCURSES_EXPANDED */