Module Name: src
Committed By: apb
Date: Mon Jun 16 22:12:30 UTC 2014
Modified Files:
src/usr.sbin/etcupdate: etcupdate
src/usr.sbin/postinstall: postinstall
Log Message:
Use extra="${2-/,}" to use $2 if defined, else default to "/,".
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/etcupdate/etcupdate
cvs rdiff -u -r1.173 -r1.174 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/etcupdate/etcupdate
diff -u src/usr.sbin/etcupdate/etcupdate:1.56 src/usr.sbin/etcupdate/etcupdate:1.57
--- src/usr.sbin/etcupdate/etcupdate:1.56 Thu Jun 12 13:56:32 2014
+++ src/usr.sbin/etcupdate/etcupdate Mon Jun 16 22:12:30 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: etcupdate,v 1.56 2014/06/12 13:56:32 apb Exp $
+# $NetBSD: etcupdate,v 1.57 2014/06/16 22:12:30 apb Exp $
#
# Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -164,7 +164,7 @@ shell_quote()
bre_quote()
{
local arg="$1"
- local extra="$2:/,"
+ local extra="${2-/,}"
printf "%s\n" "${arg}" | sed -e 's/[][^$.*\\'"${extra}"']/\\&/g'
}
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.173 src/usr.sbin/postinstall/postinstall:1.174
--- src/usr.sbin/postinstall/postinstall:1.173 Mon Jun 16 22:04:39 2014
+++ src/usr.sbin/postinstall/postinstall Mon Jun 16 22:12:30 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.173 2014/06/16 22:04:39 apb Exp $
+# $NetBSD: postinstall,v 1.174 2014/06/16 22:12:30 apb Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -138,7 +138,7 @@ shell_quote()
bre_quote()
{
local arg="$1"
- local extra="$2:/,"
+ local extra="${2-/,}"
printf "%s\n" "${arg}" | ${SED} -e 's/[][^$.*\\'"${extra}"']/\\&/g'
}
