X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=8c2ec0005b3bfe9763c8df88ed0ebe83535abd44;hb=ee4b21b73a51233003fbbe3d8acd68c9398f6dd9;hp=2f14b52ebdca6ccfc674b4e15bf29441962cf9ea;hpb=11273dd169ba2a6b8e742bd7d8bc43958c5306b7;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index 2f14b52..8c2ec00 100644
--- a/functions.sh
+++ b/functions.sh
@@ -46,38 +46,67 @@ cp_get_ifmask() {
   [ -z "$CP_ECHO_RETURN" ] || echo $RET
 }
 
+# by ddzeko, Mon, 21 Mar 2005 07:00:22 +0100
+cp_get_ifdefault() {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+  RET=""
+  case $1 in
+    dev)  RET=`route -n | awk '/^0.0.0.0/{print $8}'` ;;
+    addr) RET=`route -n | awk '/^0.0.0.0/{print $2}'` ;;
+    *)    echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;;
+  esac
+  [ -z "$RET" -a "$1" -a "$CP_VERBOSE" ] && echo "cp_get_ifdefault: No default route" >&2
+  [ -z "$CP_ECHO_RETURN" ] || echo $RET
+  [ -z "$RET" ] && return 1
+}
 
 # by ico, Tue, 15 Mar 2005 14:04:21 +0100
 cp_get_cidr() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
-  local netmask ipaddress interface cidr
+  local netmask ipaddress interface cidr echo_return
+  echo_return="$CP_ECHO_RETURN" # since we're making our own calls
+  # in our own way we need to set CP_ECHO_RETURN the way we want it
+  # but preserving initial state so it could be used afterwards
+  CP_ECHO_RETURN=""
 
   interface="$1"
   if [ -z "$interface" ]; then
-    interface="`route | awk '/^default/{print $8}'`"
+    cp_get_ifdefault dev
+    interface="$RET"
     [ -z "$interface" ] && interface=lo
   fi
 
   if ! ifconfig $interface 2> /dev/null >> /dev/null; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_cidr: $interface: No such interface"
-    return 1
+    [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such interface"
+    goto return1
   fi
 
-  ipaddress="`cp_get_ifaddr $interface`"
+  cp_get_ifaddr "$interface"
+  ipaddress="$RET"
   if [ -z $ipaddress ]; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_cidr: $interface: No such ipaddress"
-    return 1
+    [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such ipaddress"
+    goto return1
   fi
-  netmask="`cp_get_ifmask $interface`"
+  cp_get_ifmask "$interface"
+  netmask="$RET"
   if [ -z $netmask ]; then
-    [ -z "$CP_ECHO_RETURN" ] || echo "cp_get_cidr: $interface: No such netmask"
-    return 1
+    [ "$CP_VERBOSE" ] || echo "cp_get_cidr: $interface: No such netmask"
   fi
 
-  cidr="`ipcalc -n $ipaddress $netmask | grep Network: | awk '{print $2}'`"
-
+  if [ "$netmask" = "255.255.255.255" ]; then
+    cidr="$ipaddress/32"
+  else 
+    cidr="`ipcalc -ncb $ipaddress $netmask | awk '/^Network:/{print $2}'`"
+  fi
+  
   RET="$cidr"
-  [ -z "$CP_ECHO_RETURN" ] || echo $RET
+  [ -z "$echo_return" ] || echo $RET
+  CP_ECHO_RETURN="$echo_return"
+  return 0
+  
+  return1:
+    CP_ECHO_RETURN="$echo_return"
+    return 1
 }
 
 # by ico, Tue, 15 Mar 2005 14:04:21 +0100
@@ -107,6 +136,11 @@ cp_backup_conffile() {
 }
 
 # by jelly, Tue, 15 Mar 2005 14:04:21 +0100
+# A sed wrapper, to use instead of perl -pi -e
+#  - relatively safe in-place s///g
+#  - takes care of symlinks and ownership
+# returns true if changed, false if nothing happened
+#
 cp_check_and_sed() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
   local s sedcmd ret i
@@ -115,15 +149,15 @@ cp_check_and_sed() {
   sedcmd="$1"
   shift
   ret=2
-  for i in $*
+  for i in "$@"
   do
     [ -e "$i" ]        || continue
     egrep -q "$s" "$i" || continue
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
-    chown --reference "$i" "$i.dpkg-tmp"
-    chmod --reference "$i" "$i.dpkg-tmp"
     if ! cmp -s "$i" "$i.dpkg-tmp"; then
+      chown --reference "$i" "$i.dpkg-tmp"
+      chmod --reference "$i" "$i.dpkg-tmp"
       mv "$i.dpkg-tmp" "$i"
     else
       rm "$i.dpkg-tmp"
@@ -172,8 +206,7 @@ For your convenience, a partial output of the last $pkg installation
 is included below.
 
 ----------
-$CP_NOTICE
-----------"
+${CP_NOTICE}----------"
   
     echo "$CP_NOTICE" | /usr/sbin/sendmail -t &
     sleep 1