From 8c4a0aa3c0b45548b2fdcc425fea22643dbc7c68 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Sat, 2 Aug 2003 23:01:51 +0000
Subject: [PATCH] * lib/cedit.menu: Avoid using "id -u", it doesn't work on
 Solaris.  From Andrew V. Samoilov <andrew@email.zp.ua>

---
 ChangeLog      |  5 +++++
 lib/cedit.menu | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ea9dafcd9..9baf5fc84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-02  Pavel Roskin  <proski@gnu.org>
+
+	* lib/cedit.menu: Avoid using "id -u", it doesn't work on
+	Solaris.  From Andrew V. Samoilov <andrew@email.zp.ua>
+
 2003-07-23  Pavel Roskin  <proski@gnu.org>
 
 	* lib/mc.lib: Add more "end" and "home" sequences for xterm.
diff --git a/lib/cedit.menu b/lib/cedit.menu
index ababc3d9c..aefeb677d 100644
--- a/lib/cedit.menu
+++ b/lib/cedit.menu
@@ -36,7 +36,8 @@ shell_patterns=0    # expression type
         unset LANG
 	unset LANGUAGE
 	LC_ALL=
-	AUTHOR="`awk -F: /^\`id -un\`:/'{print($5)}' /etc/passwd`"
+	MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+	AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
         cat >>%b <<EOF
         #----------------------------------------------------------------------
         # Description:
@@ -127,7 +128,8 @@ a       sub ()
         unset LANG
 	unset LANGUAGE
 	LC_ALL=
-	AUTHOR="`awk -F: /^\`id -un\`:/'{print($5)}' /etc/passwd`"
+	MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+	AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
         cat >>%b <<EOF
         #----------------------------------------------------------------------
         # Description:
@@ -219,7 +221,8 @@ a       sub ()
         unset LANG
 	unset LANGUAGE
 	LC_ALL=
-	AUTHOR="`awk -F: /^\`id -un\`:/'{print($5)}' /etc/passwd`"
+	MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+	AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
         cat >> %b <<EOF
         /********************************************************************
         * Description:
@@ -420,7 +423,8 @@ a       Author description header
         unset LANG
 	unset LANGUAGE
 	LC_ALL=
-	AUTHOR="`awk -F: /^\`id -un\`:/'{print($5)}' /etc/passwd`"
+	MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+	AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
         cat >>%b <<EOF
         ----------------------------------------------------------------------
         Description:
@@ -440,7 +444,8 @@ a       Author description header
 #----------------------- Begin common section ---------------------------------
 I       Insert `Changelog' string
         DATE="`date +%%Y-%%m-%%d`"
-	AUTHOR="`awk -F: /^\`id -un\`:/'{print($5)}' /etc/passwd`"
+	MY_UID="`id | sed 's/^.*uid=\([^(]*\).*$/\1/'`"
+	AUTHOR="`awk -F: '$3 == '$MY_UID' {print $5}' /etc/passwd`"
         EMAIL="<$REPLYTO>"
         echo "$DATE  $AUTHOR  $EMAIL" >%b