From 17f313b06ac4ae24b25b46ab246b8427149ba428 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 20 Oct 2006 00:13:34 +0000 Subject: move /usr/lib/parse-config.awk to /lib/config/template.awk SVN-Revision: 5244 --- package/base-files/default/lib/config/template.awk | 42 ++++++++++++++++++++++ .../base-files/default/usr/lib/parse-config.awk | 42 ---------------------- package/dnsmasq/files/dnsmasq.init | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 package/base-files/default/lib/config/template.awk delete mode 100644 package/base-files/default/usr/lib/parse-config.awk (limited to 'package') diff --git a/package/base-files/default/lib/config/template.awk b/package/base-files/default/lib/config/template.awk new file mode 100644 index 0000000000..9ce32b74ff --- /dev/null +++ b/package/base-files/default/lib/config/template.awk @@ -0,0 +1,42 @@ +# Copyright (C) 2006 OpenWrt.org + +{ + line=$0 + gsub(/^[ \t]*/, "") + gsub(/[ \t]*$/, "") +} + +$1 == "@define" { + v[$2] = $3 +} + +$1 == "@ifdef" { + if_open = 1 + if (v[$2] != "") noprint = 0 + else noprint = 1 +} + +$1 == "@ifndef" { + if_open = 1 + if (v[$2] != "") noprint = 1 + else noprint = 0 +} + +$1 == "@else" { + if (noprint == 1) noprint = 0 + else noprint = 1 +} + +($1 !~ /^@[a-zA-Z]/) && (noprint != 1) { + n=split(line "@@", a, /@@/) + for (i=1; i<=n; i++) { + if ((i % 2) == 1) printf a[i] + else printf v[a[i]] + } + print "" +} + +$1 == "@endif" { + if_open = 0 + noprint = 0 +} diff --git a/package/base-files/default/usr/lib/parse-config.awk b/package/base-files/default/usr/lib/parse-config.awk deleted file mode 100644 index 9ce32b74ff..0000000000 --- a/package/base-files/default/usr/lib/parse-config.awk +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (C) 2006 OpenWrt.org - -{ - line=$0 - gsub(/^[ \t]*/, "") - gsub(/[ \t]*$/, "") -} - -$1 == "@define" { - v[$2] = $3 -} - -$1 == "@ifdef" { - if_open = 1 - if (v[$2] != "") noprint = 0 - else noprint = 1 -} - -$1 == "@ifndef" { - if_open = 1 - if (v[$2] != "") noprint = 1 - else noprint = 0 -} - -$1 == "@else" { - if (noprint == 1) noprint = 0 - else noprint = 1 -} - -($1 !~ /^@[a-zA-Z]/) && (noprint != 1) { - n=split(line "@@", a, /@@/) - for (i=1; i<=n; i++) { - if ((i % 2) == 1) printf a[i] - else printf v[a[i]] - } - print "" -} - -$1 == "@endif" { - if_open = 0 - noprint = 0 -} diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 8ac0ab638d..6fe074ea29 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -49,7 +49,7 @@ start() { [ -z "$wan_proto" -o "$wan_proto" = "none" ] || echo "@define wan_ifname $wan_ifname" cat /etc/dnsmasq.conf - ) | awk -f /usr/lib/parse-config.awk | dnsmasq -C /proc/self/fd/0 + ) | awk -f /lib/config/template.awk | dnsmasq -C /proc/self/fd/0 } stop() { -- cgit v1.2.3