kes Make pm_strxxx() routines handle input of NULL pointer. This

[bacula/bacula] / bacula / scripts / disk-changer.in

diff --git a/bacula/scripts/disk-changer.in b/bacula/scripts/disk-changer.in
index 94c5682f4dc23239df8e253e7a3d97e73e7bfa2c..85de7bf1de9e15e9bf1c8da74b56f4fc0f75c3ed 100644 (file)
--- a/bacula/scripts/disk-changer.in
+++ b/bacula/scripts/disk-changer.in
@@ -164,23 +164,39 @@ case $cmd in
    unload)
       debug "Doing disk -f $ctl unload $slot $device $drive"
       get_dir
-      echo "0" >$dir/loaded${drive}
-      unlink $device 2>/dev/null >/dev/null
-      rm -f $device
+      ld=`cat $dir/loaded${drive}`
+      if [ $slot -eq $ld ]; then
+        echo "0" >$dir/loaded${drive}
+        unlink $device 2>/dev/null >/dev/null
+        rm -f $device
+      else
+        echo "Storage Element $slot is Already Full"
+        exit 1
+      fi
       ;;
 
    load)
       debug "Doing disk $ctl load $slot $device $drive"
       get_dir
-      echo "0" >$dir/loaded${drive}
-      unlink $device 2>/dev/null >/dev/null
-      rm -f $device
-      ln -s $dir/slot${slot} $device
-      rtn=$?
-      if [ $rtn -eq 0 ]; then
-        echo $slot >$dir/loaded${drive}
+      if [ -f $dir/loaded${drive} ]; then
+        ld=`cat $dir/loaded${drive}`
+      else
+        ld=0
+      fi
+      if [ $ld -eq 0 ]; then
+        echo "0" >$dir/loaded${drive}
+        unlink $device 2>/dev/null >/dev/null
+        rm -f $device
+        ln -s $dir/slot${slot} $device
+        rtn=$?
+        if [ $rtn -eq 0 ]; then
+           echo $slot >$dir/loaded${drive}
+        fi
+        exit $rtn
+      else
+        echo "Drive ${drive} Full (Storage element ${ld} loaded)"
+        exit 1
       fi
-      exit $rtn
       ;;
 
    list)