From 1028514b79b3ad2dc493eefd54f29741a5421b2e Mon Sep 17 00:00:00 2001
From: eadler <eadler@FreeBSD.org>
Date: Mon, 22 Oct 2012 03:41:19 +0000
Subject: Add support for the "&" character in usernames.

Charlie & finally has his last name.

PR:		gnu/37910
Submitted by:	Harry Newton <harry_newton@telinco.co.uk>
Approved by:	cperciva
MFC after:	1 week
---
 gnu/usr.bin/send-pr/send-pr.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index 5b9d71b..dee0f48 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -23,7 +23,7 @@
 # $FreeBSD$
 
 # The version of this send-pr.
-VERSION=3.113
+VERSION=3.114
 
 # The submitter-id for your site.
 # "current-users" is the only allowable value for FreeBSD.
@@ -92,11 +92,16 @@ elif [ -f $HOME/.fullname ]; then
   ORIGINATOR="`sed -e '1q' $HOME/.fullname`"
 else
   PTEMP=`mktemp -t p` || exit 1
+  PTEMP2=`mktemp -t p` || exit 1
   # Must use temp file due to incompatibilities in quoting behavior
   # and to protect shell metacharacters in the expansion of $LOGNAME
-  $PW usershow $LOGNAME | awk -F: '{ print $8 }' | sed -e 's/,.*//' > $PTEMP
+  $ECHON1 $LOGNAME | awk '{print toupper(substr($1,1,1))substr($1,2)}' > $PTEMP2
+  ICLOGNAME="`cat $PTEMP2`"
+  $PW usershow $LOGNAME | awk -F: '{ print $8 }'    \
+			| sed -e "s/\&/$ICLOGNAME/" \
+			| sed -e 's/,.*//' > $PTEMP
   ORIGINATOR="`cat $PTEMP`"
-  rm -f $PTEMP
+  rm -f "$PTEMP" "$PTEMP2"
 fi
 
 FROM="$ORIGINATOR <$LOGNAME>"
-- 
cgit v1.1