[pkgsrc/trunk]: pkgsrc/mk/bulk Made the diagnostics for invalid characters in...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fdcc7f90021
branches:  trunk
changeset: 503367:6fdcc7f90021
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 19 11:19:10 2005 +0000

description:
Made the diagnostics for invalid characters in BULK_PREREQ and the
package list more useful by only showing the invalid characters, not the
complete variable value.

diffstat:

 mk/bulk/printindex |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r c5b9f62d050a -r 6fdcc7f90021 mk/bulk/printindex
--- a/mk/bulk/printindex        Sat Nov 19 10:55:45 2005 +0000
+++ b/mk/bulk/printindex        Sat Nov 19 11:19:10 2005 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: printindex,v 1.26 2005/11/19 10:55:45 rillig Exp $
+# $NetBSD: printindex,v 1.27 2005/11/19 11:19:10 rillig Exp $
 #
 
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -118,15 +118,17 @@
 # Sanity checks, part 2
 #
 
+alnum="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 case $BULK_PREREQ in
-*[!-\ +./0-9A-Z_a-z]*)
-       echo "$0: error: BULK_PREREQ contains invalid characters. (Its value is \"${BULK_PREREQ}\".)" 1>&2
+*[!-\ +./${alnum}_]*)
+       inval=`echo "${BULK_PREREQ}" | tr -d " +\\\\-./${alnum}_"`
+       echo "$0: error: BULK_PREREQ contains invalid characters (${inval})." 1>&2
        exit 1
 esac
 case $list in
-*[!-\ +./0-9A-Z_a-z]*)
-       echo "$0: error: The package list contains invalid characters. (Its value is \"${list}\".)" 1>&2
-       echo "$list" | tr ' ' '\n' > .list
+*[!-\ +./${alnum}_]*)
+       inval=`echo "${list}" | tr -d " +\\\\-./${alnum}_"`
+       echo "$0: error: The package list contains invalid characters (${inval})." 1>&2
        exit 1
 esac