From 947bab0abbee71ec839eb4cb8fdf88f314d82f2a Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 17 Mar 2007 13:31:13 +0000
Subject: upgrade dnsmasq to latest version, rewrite dnsmasq init script for
 uci, rename /bin/ipcalc to /bin/ipcalc.sh (fixes #1452)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6595 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/bin/ipcalc    | 32 --------------------------------
 package/base-files/files/bin/ipcalc.sh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100755 package/base-files/files/bin/ipcalc
 create mode 100755 package/base-files/files/bin/ipcalc.sh

(limited to 'package/base-files')

diff --git a/package/base-files/files/bin/ipcalc b/package/base-files/files/bin/ipcalc
deleted file mode 100755
index e8efa6b96c..0000000000
--- a/package/base-files/files/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/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
new file mode 100755
index 0000000000..e8efa6b96c
--- /dev/null
+++ b/package/base-files/files/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
-- 
cgit v1.2.3