--- orig/shell-tools
+++ mod/shell-tools
@@ -49,7 +49,7 @@
     {
 	local message="$@"
 
-	logger -p user.info -t "$(basename "$0")" -i "${message}"
+	logger -p user.info -t "$(basename -- "$0")" -i "${message}"
     }
 }
 
@@ -74,14 +74,14 @@
     {
 	local message="$@"
 
-	echo >&2 "$(basename "$0"): ${message}"
+	echo >&2 "$(basename -- "$0"): ${message}"
     }
 
     log_debug ()
     {
 	local message="$@"
 
-	logger -p user.debug -t "$(basename "$0")" -i "${message}"
+	logger -p user.debug -t "$(basename -- "$0")" -i "${message}"
     }
 }
 
@@ -90,7 +90,7 @@
 {
     local message="$@"
 
-    logger -p user.notice -t "$(basename "$0")" -i "${message}"
+    logger -p user.notice -t "$(basename -- "$0")" -i "${message}"
 }
 
 # Print warning message to standard error
@@ -98,7 +98,7 @@
 {
     local message="$@"
 
-    echo >&2 "$(basename "$0"): Warning: ${message}"
+    echo >&2 "$(basename -- "$0"): Warning: ${message}"
 }
 
 # Print warning message to syslog
@@ -106,7 +106,7 @@
 {
     local message="$@"
 
-    logger -p user.warning -t "$(basename "$0")" -i "Warning: ${message}"
+    logger -p user.warning -t "$(basename -- "$0")" -i "Warning: ${message}"
 }
 
 # Print error message to standard error
@@ -114,7 +114,7 @@
 {
     local message="$@"
 
-    echo >&2 "$(basename "$0"): Error: ${message}"
+    echo >&2 "$(basename -- "$0"): Error: ${message}"
 }
 
 # Print error message to syslog
@@ -122,7 +122,7 @@
 {
     local message="$@"
 
-    logger -p user.err -t "$(basename "$0")" -i "Error: ${message}"
+    logger -p user.err -t "$(basename -- "$0")" -i "Error: ${message}"
 }
 
 # Count number of words in given arguments
@@ -348,7 +348,7 @@
 # Invoke dd(1) filtering out verbose output
 quiet_dd ()
 {
-    local dd_output=$(mktemp -t "$(basename "$0")-dd-XXXXXX")
+    local dd_output=$(mktemp -t "$(basename -- "$0")-dd-XXXXXX")
     debug "Using temporary file '${dd_output}' for dd(1) output"
 
     local saved_traps=$(trap)
