ncurses 6.2 - patch 20200829

[ncurses.git] / ncurses / base / MKlib_gen.sh

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index a25176f8ae4b91d90be02a741f17aa4404ba5b57..3829eff8eecb0a89007c96b11965c88b2bf6db57 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,11 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.54 2016/07/09 21:43:05 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.68 2020/08/23 00:02:29 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+# Copyright 2018,2020 Thomas E. Dickey                                       #
+# Copyright 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"), #
@@ -62,7 +63,7 @@ if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
 
-preprocessor="$1 -DNCURSES_INTERNALS -I../include"
+preprocessor="$1 -DNCURSES_WATTR_MACROS -DNCURSES_INTERNALS -I../include"
 AWK="$2"
 USE="$3"
 
@@ -72,12 +73,12 @@ USE="$3"
 # appears in gcc 5.0 and (with modification) in 5.1, making it necessary to
 # determine if we are using gcc, and if so, what version because the proposed
 # solution uses a nonstandard option.
-PRG=`echo "$1" | $AWK '{ sub(/^[       ]*/,""); sub(/[         ].*$/, ""); print; }' || exit 0`
-FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
+PRG=`echo "$1" | "$AWK" '{ sub(/^[     ]*/,""); sub(/[         ].*$/, ""); print; }' || exit 0`
+FSF=`("$PRG" --version 2>/dev/null || exit 0) | fgrep "Free Software Foundation" | head -n 1`
 ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
-ONE=`echo "$ALL" | sed -e 's/\..*$//'`
+ONE=`echo "$ALL" | sed -e 's/[^0-9].*$//'`
 if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
-       if test $ONE -ge 5 ; then
+       if test "$ONE" -ge 5 ; then
                echo ".. adding -P option to work around $PRG $ALL" >&2
                preprocessor="$preprocessor -P"
        fi
@@ -91,14 +92,14 @@ ED4=sed4_${PID}.sed
 AW1=awk1_${PID}.awk
 AW2=awk2_${PID}.awk
 TMP=gen__${PID}.c
-trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 5 15
+trap "rm -f $ED1 $ED2 $ED3 $ED4 $AW1 $AW2 $TMP" 0 1 2 3 15
 
 ALL=$USE
 if test "$USE" = implemented ; then
-       CALL="call_"
        cat >$ED1 <<EOF1
 /^extern.*implemented/{
        h
+       s/GCC_DEPRECATED([^)]*)//
        s/NCURSES_SP_NAME(\([^)]*\))/NCURSES_SP_NAME___\1/
        h
        s/^.*implemented:\([^   *]*\).*/P_POUNDCif_USE_\1_SUPPORT/p
@@ -117,7 +118,6 @@ if test "$USE" = implemented ; then
 }
 EOF1
 else
-       CALL=""
        cat >$ED1 <<EOF1
 /^extern.*${ALL}/{
        h
@@ -176,7 +176,7 @@ EOF3
 
 if test "$USE" = generated ; then
 cat >$ED4 <<EOF
-       s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/
+       s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) \2 (\3)/
        /attr_[sg]et.* z)/s,z),z GCC_UNUSED),
 EOF
 else
@@ -242,6 +242,9 @@ $0 !~ /^P_/ {
                        break;
                }
        }
+       if (using == "implemented") {
+               printf "#undef %s\n", $myfunc;
+       }
        print $0;
        print "{";
        argcount = 1;
@@ -274,6 +277,11 @@ $0 !~ /^P_/ {
                dotrace = 0;
        }
 
+       do_getstr = 0;
+       if ($myfunc ~ /get[n]?str/) {
+               do_getstr = 1;
+       }
+
        call = "@@T((T_CALLED(\""
        args = ""
        comma = ""
@@ -310,7 +318,11 @@ $0 !~ /^P_/ {
                                call = call "%s"
                        } else if (pointer) {
                                if ( argtype == "char" ) {
-                                       call = call "%s"
+                                       if (do_getstr) {
+                                               call = call "%p"
+                                       } else {
+                                               call = call "%s"
+                                       }
                                        comma = comma "_nc_visbuf2(" num ","
                                        pointer = 0;
                                } else {
@@ -360,7 +372,7 @@ $0 !~ /^P_/ {
        call = call ")); "
 
        if (dotrace)
-               printf "%s", call
+               printf "%s\n\t@@", call
 
        if (match($0, "^void")) {
                call = ""
@@ -399,9 +411,10 @@ EOF1
 
 cat >$AW2 <<EOF1
 BEGIN          {
+               printf "/* This file was generated by $0 $USE */\n"
+               print ""
                print "/*"
                print " * DO NOT EDIT THIS FILE BY HAND!"
-               printf " * It is generated by $0 %s.\n", "$USE"
                if ( "$USE" == "generated" ) {
                        print " *"
                        print " * This is a file of trivial functions generated from macro"
@@ -418,14 +431,10 @@ BEGIN             {
                print "#include <ncurses_cfg.h>"
                print ""
                print "#undef NCURSES_NOMACROS  /* _this_ file uses macros */"
+               print "#define NCURSES_NOMACROS 1"
                print ""
                print "#include <curses.priv.h>"
                print ""
-               print "#undef vw_scanw"
-               print "#undef vwscanw"
-               print ""
-               print "#undef vw_printw"
-               print "#undef vwprintw"
                }
 /^DECLARATIONS/        {start = 1; next;}
                {
@@ -485,7 +494,7 @@ EOF
 sed -n -f $ED1 \
 | sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
 | sed -f $ED2 \
-| $AWK -f $AW1 using=$USE \
+| "$AWK" -f $AW1 using="$USE" \
 | sed \
        -e 's/ [ ]*$//g' \
        -e 's/^\([a-zA-Z_][a-zA-Z_]*[ *]*\)/\1 gen_/' \
@@ -497,7 +506,7 @@ $preprocessor $TMP 2>/dev/null \
        -e 's/  / /g' \
        -e 's/^ //' \
        -e 's/_Bool/NCURSES_BOOL/g' \
-| $AWK -f $AW2 \
+| "$AWK" -f $AW2 \
 | sed -f $ED3 \
 | sed \
        -e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/ return \1;/' \