ncurses 5.7 - patch 20090105

[ncurses.git] / misc / ncu-indent

diff --git a/misc/ncu-indent b/misc/ncu-indent
index 7bd1d04edc9824eea7bdb63f463ecd047fbdfc01..862a108a3b3185cc9c59b0c371f49abe73ff7f41 100755 (executable)
--- a/misc/ncu-indent
+++ b/misc/ncu-indent
@@ -1,5 +1,32 @@
 #!/bin/sh
-# $Id: ncu-indent,v 1.12 2004/11/23 00:45:48 tom Exp $
+#****************************************************************************
+#* Copyright (c) 2001-2006,2008 Thomas E. Dickey                            *
+#*                                                                          *
+#* Permission is hereby granted, free of charge, to any person obtaining a  *
+#* copy of this software and associated documentation files (the            *
+#* "Software"), to deal in the Software without restriction, including      *
+#* without limitation the rights to use, copy, modify, merge, publish,      *
+#* distribute, distribute with modifications, sublicense, and/or sell       *
+#* copies of the Software, and to permit persons to whom the Software is    *
+#* furnished to do so, subject to the following conditions:                 *
+#*                                                                          *
+#* The above copyright notice and this permission notice shall be included  *
+#* in all copies or substantial portions of the Software.                   *
+#*                                                                          *
+#* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+#* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+#* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+#* IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+#* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+#* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+#* THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+#*                                                                          *
+#* Except as contained in this notice, the name(s) of the above copyright   *
+#* holders shall not be used in advertising or otherwise to promote the     *
+#* sale, use or other dealings in this Software without prior written       *
+#* authorization.                                                           *
+#****************************************************************************/
+# $Id: ncu-indent,v 1.17 2008/08/03 15:46:44 tom Exp $
 NOOP=no
 OPTS='
 --blank-lines-after-procedures
@@ -18,6 +45,7 @@ OPTS='
 --tab-size8
 
 -T NCURSES_EXPORT_VAR
+-T NCURSES_INLINE
 -T SCREEN
 -T TERMTYPE
 -T attr_t
@@ -53,14 +81,17 @@ do
        -*)
                OPTS="$OPTS $name"
                ;;
-       *.[ch])
+       *.[ch]|*.cc|*.cpp)
                save="${name}".a$$
                test="${name}".b$$
                rm -f "$save" "$test"
                mv "$name" "$save"
                sed \
+                       -e '/EMPTY_MODULE(/s/)$/);/' \
                        -e '/MODULE_ID(/s/)$/);/' \
                        -e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
+                       -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
+                       -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
                        -e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
                        "$save" >"$test"
                cp "$test" "$name"
@@ -68,8 +99,11 @@ do
                # ${INDENT_PROG-indent} --version
                ${INDENT_PROG-indent} -npro $OPTS "$name"
                sed \
+                       -e '/EMPTY_MODULE(/s/);$/)/' \
                        -e '/MODULE_ID(/s/);$/)/' \
                        -e 's,;[        ]*//GCC_NORETURN;, GCC_NORETURN;,' \
+                       -e 's,;[        ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
+                       -e 's,;[        ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
                        -e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
                        "$name" >"$test"
                mv "$test" "$name"