From 277a3c98c2449fc9c965ba3d8a46a6e78d4db5f0 Mon Sep 17 00:00:00 2001
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Date: Fri, 27 Nov 2009 13:11:58 +0300
Subject: [PATCH 3/4] security/vuxml: refactor newentry.sh

Make new procedure, newentry(), that creates new VuXML entry,
thus incapsulating the needed functionality into the single
function.  Main code just calls it when needed.

Also make usage() to be stand-alone function.

Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
---
 security/vuxml/files/newentry.sh |   54 ++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/security/vuxml/files/newentry.sh b/security/vuxml/files/newentry.sh
index f84d0ea..f2b9e61 100644
--- a/security/vuxml/files/newentry.sh
+++ b/security/vuxml/files/newentry.sh
@@ -1,27 +1,17 @@
 #! /bin/sh
-vuxml_file="$1"
-if [ -z "${vuxml_file}" ]; then
-  exec >&2
-  echo "Usage: newentry.sh /path/to/vuxml/document"
-  exit 1
-fi
 
-cleanup() {
-  if [ "${doclean}" = "yes" ]; then
-    [ -n "${tmp}" ] && rm -f "${tmp}"
-  fi
-}
-doclean="yes"
-trap cleanup EXIT 1 2 13 15
-tmp="`mktemp ${TMPDIR:-/tmp}/vuxml.XXXXXXXXXX`" || exit 1
+new_entry () {
+  local vid discovery entry
 
-vid="`uuidgen | tr '[:upper:]' '[:lower:]'`"
-[ -z "$vid" ] && exit 1
-discovery="`date -u '+%Y-%m'`-FIXME" || exit 1
-entry="`date -u '+%Y-%m-%d'`" || exit 1
+  vid="`uuidgen | tr '[:upper:]' '[:lower:]'`"
+  discovery="`date -u '+%Y-%m'`-FIXME" || exit 1
+  entry="`date -u '+%Y-%m-%d'`" || exit 1
+  if [ -z "$vid" -o -z "$discovery" -o -z "$entry" ]; then
+    false
+    return
+  fi
 
-awk '/^<\?/,/^<vuxml/ { print }' "${vuxml_file}" >> "${tmp}" || exit 1
-cat << EOF >> "${tmp}" || exit 1
+  cat << EOF
   <vuln vid="${vid}">
     <topic> -- </topic>
     <affects>
@@ -47,6 +37,30 @@ cat << EOF >> "${tmp}" || exit 1
   </vuln>
 
 EOF
+}
+
+usage () {
+	echo "Usage: newentry.sh /path/to/vuxml/document" >&2
+}
+
+cleanup() {
+  if [ "${doclean}" = "yes" ]; then
+    [ -n "${tmp}" ] && rm -f "${tmp}"
+  fi
+}
+
+vuxml_file="$1"
+if [ -z "${vuxml_file}" ]; then
+  usage
+  exit 1
+fi
+
+doclean="yes"
+trap cleanup EXIT 1 2 13 15
+tmp="`mktemp ${TMPDIR:-/tmp}/vuxml.XXXXXXXXXX`" || exit 1
+
+awk '/^<\?/,/^<vuxml/ { print }' "${vuxml_file}" >> "${tmp}" || exit 1
+new_entry >> "${tmp}" || exit 1
 awk '/^[[:space:]]+<vuln /,/^NONE$/ { print }' \
   "${vuxml_file}" >> "${tmp}" || exit 1
 
-- 
1.6.5.3