rename ipcalc to ipcalc.sh and change known calls to it. this prevents the confusion...

SVN-Revision: 5607

diff --git a/openwrt/package/base-files/default/bin/ipcalc b/openwrt/package/base-files/default/bin/ipcalc
deleted file mode 100755 (executable)
index e8efa6b..0000000
--- a/openwrt/package/base-files/default/bin/ipcalc
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-awk -f /usr/lib/common.awk -f - $* <<EOF
-BEGIN {
-       ipaddr=ip2int(ARGV[1])
-       netmask=ip2int(ARGV[2])
-       network=and(ipaddr,netmask)
-       broadcast=or(network,compl(netmask))
-       
-       start=or(network,and(ip2int(ARGV[3]),compl(netmask)))
-       limit=network+1
-       if (start<limit) start=limit
-       
-       end=start+ARGV[4]
-       limit=or(network,compl(netmask))-1
-       if (end>limit) end=limit
-
-       print "IP="int2ip(ipaddr)
-       print "NETMASK="int2ip(netmask)
-       print "BROADCAST="int2ip(broadcast)
-       print "NETWORK="int2ip(network)
-       print "PREFIX="32-bitcount(compl(netmask))
-       
-       # range calculations:
-       # ipcalc <ip> <netmask> <start> <num>
-       
-       if (ARGC > 3) {
-               print "START="int2ip(start)
-               print "END="int2ip(end-1)
-       }
-}
-EOF

diff --git a/openwrt/package/base-files/default/bin/ipcalc.sh b/openwrt/package/base-files/default/bin/ipcalc.sh
new file mode 100755 (executable)
index 0000000..e8efa6b
--- /dev/null
+++ b/openwrt/package/base-files/default/bin/ipcalc.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+awk -f /usr/lib/common.awk -f - $* <<EOF
+BEGIN {
+       ipaddr=ip2int(ARGV[1])
+       netmask=ip2int(ARGV[2])
+       network=and(ipaddr,netmask)
+       broadcast=or(network,compl(netmask))
+       
+       start=or(network,and(ip2int(ARGV[3]),compl(netmask)))
+       limit=network+1
+       if (start<limit) start=limit
+       
+       end=start+ARGV[4]
+       limit=or(network,compl(netmask))-1
+       if (end>limit) end=limit
+
+       print "IP="int2ip(ipaddr)
+       print "NETMASK="int2ip(netmask)
+       print "BROADCAST="int2ip(broadcast)
+       print "NETWORK="int2ip(network)
+       print "PREFIX="32-bitcount(compl(netmask))
+       
+       # range calculations:
+       # ipcalc <ip> <netmask> <start> <num>
+       
+       if (ARGC > 3) {
+               print "START="int2ip(start)
+               print "END="int2ip(end-1)
+       }
+}
+EOF

diff --git a/openwrt/package/base-files/default/etc/init.d/rcS b/openwrt/package/base-files/default/etc/init.d/rcS
index d93c81224c4c768bdd839ed22119eff2b1c20380..02f665877bfe677bab574483014bf0ed03d8bc4e 100755 (executable)
--- a/openwrt/package/base-files/default/etc/init.d/rcS
+++ b/openwrt/package/base-files/default/etc/init.d/rcS
@@ -1,6 +1,6 @@
 #!/bin/sh
 syslog_ip=$(nvram get log_ipaddr)
-eval $(ipcalc "$syslog_ip")
+eval $(ipcalc.sh "$syslog_ip")
 [ "$syslog_ip" = "$IP" ] || syslog_ip=""
 syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
 klogd

diff --git a/openwrt/package/dnsmasq/files/S60dnsmasq b/openwrt/package/dnsmasq/files/S60dnsmasq
index 1699659ea676f9733b683df91f93163077a16398..2556a9c87ee808593840cd4faa038a099f81c0d0 100755 (executable)
--- a/openwrt/package/dnsmasq/files/S60dnsmasq
+++ b/openwrt/package/dnsmasq/files/S60dnsmasq
@@ -18,7 +18,7 @@ udhcpc -n -q -R -s /bin/true -i $ifname >&- || {
     start=$(nvram get dhcp_start)
       num=$(nvram get dhcp_num)
 
-  eval $(ipcalc $ipaddr $netmask ${start:-100} ${num:-150})
+  eval $(ipcalc.sh $ipaddr $netmask ${start:-100} ${num:-150})
   lease=$(nvram get dhcp_lease)
   
   # and pass the args via the commandline