mirror of
https://github.com/sheumann/hush.git
synced 2024-12-23 05:29:58 +00:00
gen_build_files: don't pass 200k+ strings as params. Closes 4321
Also removes one grep per generated file. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
f74f280a14
commit
efd08bfa0a
@ -19,25 +19,20 @@ chk() { status "CHK" "$@"; }
|
|||||||
|
|
||||||
generate()
|
generate()
|
||||||
{
|
{
|
||||||
local src="$1" dst="$2" header="$3" insert="$4"
|
# NB: data to be inserted at INSERT line is coming on stdin
|
||||||
|
local src="$1" dst="$2" header="$3"
|
||||||
#chk "${dst}"
|
#chk "${dst}"
|
||||||
(
|
{
|
||||||
# Need to use printf: different shells have inconsistent
|
# Need to use printf: different shells have inconsistent
|
||||||
# rules re handling of "\n" in echo params,
|
# rules re handling of "\n" in echo params.
|
||||||
# and ${insert} definitely contains "\n".
|
|
||||||
# Therefore, echo "${header}" would not work:
|
|
||||||
printf "%s\n" "${header}"
|
printf "%s\n" "${header}"
|
||||||
if grep -qs '^INSERT$' "${src}"; then
|
# print everything up to INSERT line
|
||||||
sed -n '1,/^INSERT$/p' "${src}"
|
sed -n '/^INSERT$/q;1,/^INSERT$/p' "${src}"
|
||||||
printf "%s\n" "${insert}"
|
# copy stdin to stdout
|
||||||
sed -n '/^INSERT$/,$p' "${src}"
|
cat
|
||||||
else
|
# print everything after INSERT line
|
||||||
if [ -n "${insert}" ]; then
|
sed -n '/^INSERT$/{:l;n;p;bl}' "${src}"
|
||||||
printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
|
} >"${dst}.tmp"
|
||||||
fi
|
|
||||||
cat "${src}"
|
|
||||||
fi
|
|
||||||
) | sed '/^INSERT$/d' > "${dst}.tmp"
|
|
||||||
if ! cmp -s "${dst}" "${dst}.tmp"; then
|
if ! cmp -s "${dst}" "${dst}.tmp"; then
|
||||||
gen "${dst}"
|
gen "${dst}"
|
||||||
mv "${dst}.tmp" "${dst}"
|
mv "${dst}.tmp" "${dst}"
|
||||||
@ -47,24 +42,21 @@ generate()
|
|||||||
}
|
}
|
||||||
|
|
||||||
# (Re)generate include/applets.h
|
# (Re)generate include/applets.h
|
||||||
s=`sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
|
sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
|
||||||
generate \
|
| generate \
|
||||||
"$srctree/include/applets.src.h" \
|
"$srctree/include/applets.src.h" \
|
||||||
"include/applets.h" \
|
"include/applets.h" \
|
||||||
"/* DO NOT EDIT. This file is generated from applets.src.h */" \
|
"/* DO NOT EDIT. This file is generated from applets.src.h */"
|
||||||
"${s}"
|
|
||||||
|
|
||||||
# (Re)generate include/usage.h
|
# (Re)generate include/usage.h
|
||||||
# We add line continuation backslash after each line,
|
# We add line continuation backslash after each line,
|
||||||
# and insert empty line before each line which doesn't start
|
# and insert empty line before each line which doesn't start
|
||||||
# with space or tab
|
# with space or tab
|
||||||
# (note: we need to use \\\\ because of ``)
|
sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
|
||||||
s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c`
|
| generate \
|
||||||
generate \
|
|
||||||
"$srctree/include/usage.src.h" \
|
"$srctree/include/usage.src.h" \
|
||||||
"include/usage.h" \
|
"include/usage.h" \
|
||||||
"/* DO NOT EDIT. This file is generated from usage.src.h */" \
|
"/* DO NOT EDIT. This file is generated from usage.src.h */"
|
||||||
"${s}"
|
|
||||||
|
|
||||||
# (Re)generate */Kbuild and */Config.in
|
# (Re)generate */Kbuild and */Config.in
|
||||||
{ cd -- "$srctree" && find . -type d; } | while read -r d; do
|
{ cd -- "$srctree" && find . -type d; } | while read -r d; do
|
||||||
@ -75,11 +67,10 @@ generate \
|
|||||||
if test -f "$src"; then
|
if test -f "$src"; then
|
||||||
mkdir -p -- "$d" 2>/dev/null
|
mkdir -p -- "$d" 2>/dev/null
|
||||||
|
|
||||||
s=`sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c`
|
sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c \
|
||||||
generate \
|
| generate \
|
||||||
"${src}" "${dst}" \
|
"${src}" "${dst}" \
|
||||||
"# DO NOT EDIT. This file is generated from Kbuild.src" \
|
"# DO NOT EDIT. This file is generated from Kbuild.src"
|
||||||
"${s}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
src="$srctree/$d/Config.src"
|
src="$srctree/$d/Config.src"
|
||||||
@ -87,11 +78,10 @@ generate \
|
|||||||
if test -f "$src"; then
|
if test -f "$src"; then
|
||||||
mkdir -p -- "$d" 2>/dev/null
|
mkdir -p -- "$d" 2>/dev/null
|
||||||
|
|
||||||
s=`sed -n 's@^//config:@@p' "$srctree/$d"/*.c`
|
sed -n 's@^//config:@@p' "$srctree/$d"/*.c \
|
||||||
generate \
|
| generate \
|
||||||
"${src}" "${dst}" \
|
"${src}" "${dst}" \
|
||||||
"# DO NOT EDIT. This file is generated from Config.src" \
|
"# DO NOT EDIT. This file is generated from Config.src"
|
||||||
"${s}"
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user