Module Name: src
Committed By: mlelstv
Date: Sat Jan 9 16:25:19 UTC 2021
Modified Files:
src/sbin/devpubd/hooks: 02-wedgenames
Log Message:
Also replace calls to dirname.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/devpubd/hooks/02-wedgenames
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/devpubd/hooks/02-wedgenames
diff -u src/sbin/devpubd/hooks/02-wedgenames:1.5 src/sbin/devpubd/hooks/02-wedgenames:1.6
--- src/sbin/devpubd/hooks/02-wedgenames:1.5 Sat Jan 9 14:00:05 2021
+++ src/sbin/devpubd/hooks/02-wedgenames Sat Jan 9 16:25:19 2021
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: 02-wedgenames,v 1.5 2021/01/09 14:00:05 mlelstv Exp $
+# $NetBSD: 02-wedgenames,v 1.6 2021/01/09 16:25:19 mlelstv Exp $
#
# Try to maintain symlinks to wedge devices
#
@@ -81,7 +81,7 @@ remove_wedge() {
t=$(simple_readlink "$w")
if [ x"$t" = x"/dev/$1" ]; then
rm -f "$w"
- basedir=$(dirname "$w")
+ basedir=${w%/*}
rmdir -p "$basedir" 2>/dev/null
fi
done
@@ -95,7 +95,8 @@ add_wedge() {
n="${l#*: }"
n=$(encode "$n")
test -d $wedgedir || mkdir -m 755 $wedgedir
- basedir=$(dirname "$wedgedir/$n")
+ basedir="$wedgedir/$n"
+ basedir=${basedir%/*}
test -d "$basedir" || mkdir -p -m 755 "$basedir"
if oldlink=$(simple_readlink "$wedgedir/$n"); then
if [ x"$oldlink" != x"/dev/$1" ]; then
