package: avoid the use of eval to parse ipcalc.sh output

[openwrt/staging/wigyori.git] / package / network / services / dnsmasq / files / dnsmasq.init

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 2a3327b0c6f2638f7d092d5b3b3d6e48a2a5472f..184e7ff0ed571b62bde2a1268fb3b74a9420e7c6 100755 (executable)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -1,6 +1,8 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2007-2012 OpenWrt.org
 
+. /lib/functions.sh
+
 START=19
 
 USE_PROCD=1
@@ -509,7 +511,6 @@ dhcp_boot_add() {
        dhcp_option_add "$cfg" "$networkid" "$force"
 }
 
-
 dhcp_add() {
        local cfg="$1"
        local dhcp6range="::"
@@ -587,7 +588,7 @@ dhcp_add() {
        fi
 
        # make sure the DHCP range is not empty
-       if [ "$dhcpv4" != "disabled" ] && eval "$(ipcalc.sh "${subnet%%/*}" "$netmask" "$start" "$limit")" ; then
+       if [ "$dhcpv4" != "disabled" ] && ipcalc "${subnet%%/*}" "$netmask" "$start" "$limit" ; then
                [ "$dynamicdhcpv4" = "0" ] && END="static"
 
                xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}"