pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/bulk - Added pbc_checkpathname, pbc_checkbasename, ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1decdc5a1c0
branches:  trunk
changeset: 505795:b1decdc5a1c0
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jan 07 22:27:56 2006 +0000

description:
- Added pbc_checkpathname, pbc_checkbasename, pbc_checkurl.
- Modified pbc_checkexisting{dir,file} to use pbc_checkpathname.

diffstat:

 mk/bulk/post-build-conf |  42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 7a2aa5737cba -r b1decdc5a1c0 mk/bulk/post-build-conf
--- a/mk/bulk/post-build-conf   Sat Jan 07 22:10:31 2006 +0000
+++ b/mk/bulk/post-build-conf   Sat Jan 07 22:27:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: post-build-conf,v 1.9 2005/12/03 01:00:37 rillig Exp $
+# $NetBSD: post-build-conf,v 1.10 2006/01/07 22:27:56 rillig Exp $
 #
 
 # This file is included after the build.conf file by the "build" and
@@ -77,14 +77,31 @@
        esac
 }
 
-# usage: pbc_checkexistingfile varname
-pbc_checkexistingfile() {
+# usage: pbc_checkpathname varname
+pbc_checkpathname() {
        eval "pbc_val=\${$1-}"
 
        case $pbc_val in
        /*)     ;;
        *)      pbc_die "$1 must be an absolute pathname.";;
        esac
+}
+
+# usage: pbc_checkbasename varname
+pbc_checkbasename() {
+       eval "pbc_val=\${$1-}"
+
+       case $pbc_val in
+       */*)    pbc_die "$1 must not contain slashes.";;
+       esac
+}
+
+# usage: pbc_checkexistingfile varname
+pbc_checkexistingfile() {
+
+       pbc_checkpathname "$1"
+
+       eval "pbc_val=\${$1-}"
 
        test -f "${pbc_val}" \
        || pbc_die "$1 must be the name of an existing file."
@@ -92,15 +109,24 @@
 
 # usage: pbc_checkexistingdir varname
 pbc_checkexistingdir() {
+
+       pbc_checkpathname "$1"
+
+       eval "pbc_val=\${$1-}"
+
+       test -d "${pbc_val}" \
+       || pbc_die "$1 must be the name of an existing directory."
+}
+
+# usage: pbc_checkurl varname
+pbc_checkurl() {
        eval "pbc_val=\${$1-}"
 
        case $pbc_val in
-       /*)     ;;
-       *)      pbc_die "$1 must be an absolute pathname.";;
+       file:///*|ftp://*|http://*)
+               ;;
+       *)      pbc_die "$1 is not a valid URL.";;
        esac
-
-       test -d "${pbc_val}" \
-       || pbc_die "$1 must be the name of an existing directory."
 }
 
 # usage: pbc_checknonempty varname



Home | Main Index | Thread Index | Old Index