r91: Pazi na slucaj cudne mrezne konfiguracije -- visestrukih

[carnet-tools-cn.git] / functions.sh

diff --git a/functions.sh b/functions.sh
index 47ad62f..a50c280 100644 (file)
--- a/functions.sh
+++ b/functions.sh
@@ -88,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
 
@@ -173,6 +179,7 @@ cp_backup_conffile() {
     -p)
       shift
       opt_p=1
+      ;;
     -d)
       shift
       opt_d=1
@@ -187,11 +194,13 @@ cp_backup_conffile() {
     -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