aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-13 01:44:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-13 01:44:57 +0000
commit803e9ceb90965088dedccbb68785543d9207eff4 (patch)
tree0e161f9d2101bd6f2a913a91c85e9309b9d80488 /package/base-files/files
parent5ad114bf478168692fdb7768880ed5ee01d94ee6 (diff)
downloadupstream-803e9ceb90965088dedccbb68785543d9207eff4.tar.gz
upstream-803e9ceb90965088dedccbb68785543d9207eff4.tar.bz2
upstream-803e9ceb90965088dedccbb68785543d9207eff4.zip
base-files: /usr/lib/common.awk is only used by /bin/ipcalc.sh, move the code there
SVN-Revision: 25495
Diffstat (limited to 'package/base-files/files')
-rwxr-xr-xpackage/base-files/files/bin/ipcalc.sh21
-rw-r--r--package/base-files/files/usr/lib/common.awk26
2 files changed, 21 insertions, 26 deletions
diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
index 318980e5a2..e4826672e8 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 b73d4fc23d..0000000000
--- 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
-}