Split some code into functions for easier reading

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@18473 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 16 insertions, 4 deletions

diff --git a/bin/gen-DSA b/bin/gen-DSA
index e0d2d48022..969be0b0bf 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -50,13 +50,25 @@ if printf '%s' "$1" | grep -Eq '^(DSA-|)[0-9]+(-[0-9]+|)$'; then
     shift
 fi
 
-PACKAGE="$(printf '%s' "$1" | tr "[:upper:]" "[:lower:]")"
+toupper() {
+    printf '%s' "$1" | tr '[:lower:]' '[:upper:]'
+}
+
+tolower() {
+    printf '%s' "$1" | tr '[:upper:]' '[:lower:]'
+}
+
+split_n_sort() {
+    printf '%s' "$1" | sed 's/[ ,;]+/ /g' | tr ' ' "\n" | sort -n |
+    tr "\n" ' ' | sed -r 's/\s+/ /g;s/\s$//'
+}
+
+PACKAGE="$(tolower "$1")"
 VULNERABILITY="$2"
-CVE="$(printf '%s' "$3" | tr "[:lower:]" "[:upper:]")"
+CVE="$(toupper "$3")"
 BUGNUM="$4"
 
-CVE="$(printf '%s' "$CVE" | sed 's/[ ,;]+/ /g' | tr ' ' "\n" | sort -n | tr "\n" ' ')"
-CVE="${CVE% }"
+CVE="$(split_n_sort "$CVE")"
 cve_spacing=
 
 for i in $(seq 0 16); do