X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=a50c2800e3a3beaf4f9ef324e9131cf579fa23f9;hb=d77e70e31638a50f6c1dceb4d5b11c6959ab3857;hp=8ef825431168896f839b84c23eaf89c1f46589ef;hpb=5d2f462427acf38aafc0e2d3a203ce0197b3eafc;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index 8ef8254..a50c280 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1,3 +1,9 @@
+# Initialize "public" CP_ECHO_RETURN variable once
+if [ -z "$_CP_INIT_ECHO_RETURN" ]; then
+  _CP_INIT_ECHO_RETURN=1
+  CP_ECHO_RETURN=""
+fi
+
 # by ddzeko & ico, Fri, 18 Mar 2005 14:44:08 +0100
 cp_get_ifaddr() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
@@ -82,8 +88,14 @@ cp_get_ifdefault() {
 
   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}'` ;;
+    dev)  RET=`route -n | \
+               awk 'BEGIN	{m = 2^32}
+               	    /^0.0.0.0\b/{if ($5 < m) {r = $8; m = $5}}
+               	    END		{print r}'`
+    addr) RET=`route -n | \
+               awk 'BEGIN	{m = 2^32}
+               	    /^0.0.0.0\b/{if ($5 < m) {r = $2; m = $5}}
+               	    END		{print r}'`
     *)    echo "cp_get_ifdefault: Argument required (dev or addr)" >&2 ;;
   esac
 
@@ -153,11 +165,50 @@ cp_check_and_backup() {
 cp_backup_conffile() {
   [ "$CP_SCRIPT_DEBUG" ] && set -vx
 
-  local file_bak check did
+  local dir ext file_bak check did opt_p opt_d
   
-  if [ "x$1" = "x-r" ]; then
-    check=1
-    shift
+  dir=/var/backups
+  ext=.bak
+  
+  while echo "x$1" |grep -q '^x-'; do
+    case "$1" in
+    -r)
+      shift
+      check=1
+      ;;
+    -p)
+      shift
+      opt_p=1
+      ;;
+    -d)
+      shift
+      opt_d=1
+      # Is argument to -d full path or relative?
+      if echo "$1" |grep -q '^/'; then
+        dir="$1"
+      else
+        dir="$dir/$1"
+      fi
+      shift
+      ;;
+    -n)
+      shift
+      ext=
+      ;;
+    esac
+  done
+  if [ "$opt_d" ]; then
+    if [ ! -e "$dir" -a "$opt_p" ]; then
+      mkdir "$dir"
+    fi
+    if [ $? -ne 0 ]; then
+      echo "cp_backup_conffile: Error creating backup directory $dir" 1>&2
+      return 3
+    fi
+  fi
+  if [ ! -d "$dir" ]; then
+    echo "cp_backup_conffile: Invalid backup directory $dir" 1>&2
+    return 3
   fi
   if [ -z "$1" ]; then
     return 1
@@ -167,9 +218,9 @@ cp_backup_conffile() {
     return 2
   fi
   if [ -z "$2" ]; then
-    file_bak="/var/backups/`basename $1`.bak"
+    file_bak="$dir/`basename $1`$ext"
   else
-    file_bak="/var/backups/`basename $2`.bak"
+    file_bak="$dir/`basename $2`$ext"
   fi
 
   if [ ! -f "$file_bak" ]; then