diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-10-09 14:23:58 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-10-09 14:23:58 +0000 |
| commit | 1cecd487ab8d4887ffb5e9b524a956ffa3de06f7 (patch) | |
| tree | d19001454f8b8513198c1f1b00febc8b311183d9 | |
| parent | Properly initialize secondary CPUs on 64bit machines. (diff) | |
| download | wireguard-openbsd-1cecd487ab8d4887ffb5e9b524a956ffa3de06f7.tar.xz wireguard-openbsd-1cecd487ab8d4887ffb5e9b524a956ffa3de06f7.zip | |
Make sure _instdir is not null.
issue reported by jsg@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 173c4b36d0f..2a493d3e843 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.190 2014/09/16 21:56:42 rpe Exp $ +# $OpenBSD: sysmerge.sh,v 1.191 2014/10/09 14:23:58 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -293,6 +293,7 @@ sm_init() { sm_install() { local _dmode _fgrp _fmode _fown _instdir _instdir=${TARGET%/*} + [[ -z ${_instdir} ]] && _instdir="/" _dmode=$(stat -f "%OMp%OLp" ./${_instdir}) || return eval $(stat -f "_fmode=%OMp%OLp _fown=%Su _fgrp=%Sg" ${COMPFILE}) || return |