X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2FMKlib_gen.sh;h=c7877bfcd863d325bc4292fa3c87cff8364cfc37;hp=1552711966ef1131e0e5cd8232e6188175544779;hb=e33150410925e7858dacebb585a9bd90db683d86;hpb=58552e8c761a70f8f0bd591fecdf576fa8216e3e;ds=sidebyside

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 15527119..c7877bfc 100755
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.56 2017/01/07 16:02:47 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.60 2017/12/09 22:27:41 tom Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,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"), #
@@ -91,7 +91,7 @@ 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
@@ -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,7 +411,7 @@ EOF1
 
 cat >$AW2 <<EOF1
 BEGIN		{
-		printf "/* This file was generated by $0 */\n"
+		printf "/* This file was generated by $0 $USE */\n"
 		print ""
 		print "/*"
 		print " * DO NOT EDIT THIS FILE BY HAND!"