From 1c53c804001aeefd8ec5663511f8e973a2622c40 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 13 Feb 2011 01:44:57 +0000
Subject: base-files: /usr/lib/common.awk is only used by /bin/ipcalc.sh, move
the code there
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25495 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/base-files/files/bin/ipcalc.sh | 21 +++++++++++++++++++++
package/base-files/files/usr/lib/common.awk | 26 --------------------------
2 files changed, 21 insertions(+), 26 deletions(-)
delete mode 100644 package/base-files/files/usr/lib/common.awk
(limited to 'package/base-files')
diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
index 318980e5a..e4826672e 100755
--- a/package/base-files/files/bin/ipcalc.sh
+++ b/package/base-files/files/bin/ipcalc.sh
@@ -1,6 +1,27 @@
#!/bin/sh
awk -f /usr/lib/common.awk -f - $* <<EOF
+function bitcount(c) {
+ c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
+ c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
+ c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
+ c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
+ c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
+ return c
+}
+
+function ip2int(ip) {
+ for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x])
+ return ret
+}
+
+function int2ip(ip,ret,x) {
+ ret=and(ip,255)
+ ip=rshift(ip,8)
+ for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
+ return ret
+}
+
BEGIN {
ipaddr=ip2int(ARGV[1])
netmask=ip2int(ARGV[2])
diff --git a/package/base-files/files/usr/lib/common.awk b/package/base-files/files/usr/lib/common.awk
deleted file mode 100644
index b73d4fc23..000000000
--- a/package/base-files/files/usr/lib/common.awk
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2006 OpenWrt.org
-
-function bitcount(c) {
- c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
- c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
- c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
- c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
- c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
- return c
-}
-
-function validate_netmask(nm) {
- return and(-nm,compl(nm))
-}
-
-function ip2int(ip) {
- for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x])
- return ret
-}
-
-function int2ip(ip,ret,x) {
- ret=and(ip,255)
- ip=rshift(ip,8)
- for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
- return ret
-}
--
cgit v1.2.3