[libvirt] [PATCH] Don't require gawk for a simple print expression
Fedora uses gawk as awk so there's no change and in behavior while Debian/Ubuntu use mawk by default. This was reported by Luca Capello in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636712 --- src/nwfilter/nwfilter_ebiptables_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 11fd04c..ad1d055 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -84,7 +84,7 @@ static char *ebtables_cmd_path; static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; -static char *gawk_cmd_path; +static char *awk_cmd_path; #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) @@ -586,7 +586,7 @@ static int iptablesLinkIPTablesBaseChain(virBufferPtr buf, grep_cmd_path, udchain, syschain, pos, udchain, - gawk_cmd_path, + awk_cmd_path, pos, @@ -4288,7 +4288,7 @@ ebiptablesDriverInit(bool privileged) if (virMutexInit(&execCLIMutex) < 0) return -EINVAL; - gawk_cmd_path = virFindFileInPath("gawk"); + awk_cmd_path = virFindFileInPath("awk"); grep_cmd_path = virFindFileInPath("grep"); /* @@ -4302,9 +4302,9 @@ ebiptablesDriverInit(bool privileged) /* make sure tools are available and work */ ebiptablesDriverTestCLITools(); - /* ip(6)tables support needs gawk & grep, ebtables doesn't */ + /* ip(6)tables support needs awk & grep, ebtables doesn't */ if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) && - (!grep_cmd_path || !gawk_cmd_path)) { + (!grep_cmd_path || !awk_cmd_path)) { VIR_ERROR(_("essential tools to support ip(6)tables " "firewalls could not be located")); VIR_FREE(iptables_cmd_path); @@ -4326,7 +4326,7 @@ ebiptablesDriverInit(bool privileged) static void ebiptablesDriverShutdown(void) { - VIR_FREE(gawk_cmd_path); + VIR_FREE(awk_cmd_path); VIR_FREE(grep_cmd_path); VIR_FREE(ebtables_cmd_path); VIR_FREE(iptables_cmd_path); -- 1.7.10.4
On 08/28/2012 01:57 AM, Guido Günther wrote:
Fedora uses gawk as awk so there's no change and in behavior while Debian/Ubuntu use mawk by default.
This was reported by Luca Capello in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636712 --- src/nwfilter/nwfilter_ebiptables_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
ACK. I confirmed that our only use of awk was for the simple script '{print $1}', so this patch is a good quick fix. But down the road, I would welcome a patch to simplify iptablesLinkIPTablesBaseChain() to avoid gawk altogether. Right now, we are using gawk to split out the first field of $($IPT -L $chain -n --line-number | grep " $chain "); but the shell is already sufficient to split out a whitespace separated field. That is, instead of: r=$(echo $res | $awk '{print $1}') if [ "${r}" != "$pos" ]; then we could use: set dummy $res r=$2 if [ "$r" != "$pos" ]; then provided that we audit that the rest of our generated shell script output doesn't care that we overwrote positional arguments with set. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Guido Günther