Deleted Added
sdiff udiff text old ( 166125 ) new ( 184989 )
full compact
ncu-indent (166125) ncu-indent (184989)
1#!/bin/sh
2#****************************************************************************
1#!/bin/sh
2#****************************************************************************
3#* Copyright (c) 2001-2005,2006 Thomas E. Dickey *
3#* Copyright (c) 2001-2006,2008 Thomas E. Dickey *
4#* *
5#* Permission is hereby granted, free of charge, to any person obtaining a *
6#* copy of this software and associated documentation files (the *
7#* "Software"), to deal in the Software without restriction, including *
8#* without limitation the rights to use, copy, modify, merge, publish, *
9#* distribute, distribute with modifications, sublicense, and/or sell *
10#* copies of the Software, and to permit persons to whom the Software is *
11#* furnished to do so, subject to the following conditions: *

--- 9 unchanged lines hidden (view full) ---

21#* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
22#* THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23#* *
24#* Except as contained in this notice, the name(s) of the above copyright *
25#* holders shall not be used in advertising or otherwise to promote the *
26#* sale, use or other dealings in this Software without prior written *
27#* authorization. *
28#****************************************************************************/
4#* *
5#* Permission is hereby granted, free of charge, to any person obtaining a *
6#* copy of this software and associated documentation files (the *
7#* "Software"), to deal in the Software without restriction, including *
8#* without limitation the rights to use, copy, modify, merge, publish, *
9#* distribute, distribute with modifications, sublicense, and/or sell *
10#* copies of the Software, and to permit persons to whom the Software is *
11#* furnished to do so, subject to the following conditions: *

--- 9 unchanged lines hidden (view full) ---

21#* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR *
22#* THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
23#* *
24#* Except as contained in this notice, the name(s) of the above copyright *
25#* holders shall not be used in advertising or otherwise to promote the *
26#* sale, use or other dealings in this Software without prior written *
27#* authorization. *
28#****************************************************************************/
29# $Id: ncu-indent,v 1.16 2006/02/18 17:02:22 tom Exp $
29# $Id: ncu-indent,v 1.17 2008/08/03 15:46:44 tom Exp $
30NOOP=no
31OPTS='
32--blank-lines-after-procedures
33--braces-on-if-line
34--continuation-indentation0
35--continue-at-parentheses
36--cuddle-else
37--indent-level4

--- 44 unchanged lines hidden (view full) ---

82 OPTS="$OPTS $name"
83 ;;
84 *.[ch]|*.cc|*.cpp)
85 save="${name}".a$$
86 test="${name}".b$$
87 rm -f "$save" "$test"
88 mv "$name" "$save"
89 sed \
30NOOP=no
31OPTS='
32--blank-lines-after-procedures
33--braces-on-if-line
34--continuation-indentation0
35--continue-at-parentheses
36--cuddle-else
37--indent-level4

--- 44 unchanged lines hidden (view full) ---

82 OPTS="$OPTS $name"
83 ;;
84 *.[ch]|*.cc|*.cpp)
85 save="${name}".a$$
86 test="${name}".b$$
87 rm -f "$save" "$test"
88 mv "$name" "$save"
89 sed \
90 -e '/EMPTY_MODULE(/s/)$/);/' \
90 -e '/MODULE_ID(/s/)$/);/' \
91 -e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
92 -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
93 -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
94 -e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
95 "$save" >"$test"
96 cp "$test" "$name"
97 chmod u+w "$name"
98 # ${INDENT_PROG-indent} --version
99 ${INDENT_PROG-indent} -npro $OPTS "$name"
100 sed \
91 -e '/MODULE_ID(/s/)$/);/' \
92 -e 's,\<GCC_NORETURN;,;//GCC_NORETURN;,' \
93 -e 's,\<GCC_PRINTFLIKE(,;//GCC_PRINTFLIKE(,' \
94 -e 's,\<GCC_SCANFLIKE(,;//GCC_SCANFLIKE(,' \
95 -e 's,\(\<NCURSES_EXPORT_VAR\>\),//\1,' \
96 "$save" >"$test"
97 cp "$test" "$name"
98 chmod u+w "$name"
99 # ${INDENT_PROG-indent} --version
100 ${INDENT_PROG-indent} -npro $OPTS "$name"
101 sed \
102 -e '/EMPTY_MODULE(/s/);$/)/' \
101 -e '/MODULE_ID(/s/);$/)/' \
102 -e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \
103 -e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
104 -e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
105 -e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
106 "$name" >"$test"
107 mv "$test" "$name"
108 rm -f "${name}~"

--- 22 unchanged lines hidden --- 		103 -e '/MODULE_ID(/s/);$/)/' \
104 -e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \
105 -e 's,;[ ]*//GCC_PRINTFLIKE(, GCC_PRINTFLIKE(,' \
106 -e 's,;[ ]*//GCC_SCANFLIKE(, GCC_SCANFLIKE(,' \
107 -e 's,//\(\<NCURSES_EXPORT_VAR\>\),\1,' \
108 "$name" >"$test"
109 mv "$test" "$name"
110 rm -f "${name}~"

--- 22 unchanged lines hidden ---