From 2483b7de82423d6bf0dec774526a2ca9fef3d64d Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 30 Nov 2008 23:27:36 -0500
Subject: [PATCH] add a couple of bugs about posix compliance and the use of
 getopts instead of getopt.

---
 src/common                                      | 2 +-
 src/monkeysphere                                | 2 +-
 src/monkeysphere-server                         | 4 ++--
 website/bugs/posix_compliance.mdwn              | 9 +++++++++
 website/bugs/use_getopts_instead_of_getopt.mdwn | 4 ++++
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 website/bugs/posix_compliance.mdwn
 create mode 100644 website/bugs/use_getopts_instead_of_getopt.mdwn

diff --git a/src/common b/src/common
index 51b0470..f6000d3 100644
--- a/src/common
+++ b/src/common
@@ -147,7 +147,7 @@ advance_date() {
     local shortunits
 
     # try things the GNU way first 
-    if date -d "$number $longunits" "$format" >&/dev/null ; then
+    if date -d "$number $longunits" "$format" >/dev/null 2>&1; then
 	date -d "$number $longunits" "$format"
     else
 	# otherwise, convert to (a limited version of) BSD date syntax:
diff --git a/src/monkeysphere b/src/monkeysphere
index 7e800cc..523ddfe 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -158,7 +158,7 @@ EOF
     log verbose "done."
 }
 
-function subkey_to_ssh_agent() {
+subkey_to_ssh_agent() {
     # try to add all authentication subkeys to the agent:
 
     local sshaddresponse
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index a73b253..c4f6985 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -866,9 +866,9 @@ add_certifier() {
     # export the key to the host keyring
     gpg_authentication "--export 0x${fingerprint}!" | gpg_host --import
 
-    if [ "$trust" == marginal ]; then
+    if [ "$trust" = marginal ]; then
 	trustval=1
-    elif [ "$trust" == full ]; then
+    elif [ "$trust" = full ]; then
 	trustval=2
     else
 	failure "Trust value requested ('$trust') was unclear (only 'marginal' or 'full' are supported)."
diff --git a/website/bugs/posix_compliance.mdwn b/website/bugs/posix_compliance.mdwn
new file mode 100644
index 0000000..c2908ad
--- /dev/null
+++ b/website/bugs/posix_compliance.mdwn
@@ -0,0 +1,9 @@
+It would be nice to make all of the Monkeysphere scripts POSIX
+compliant, for portability and light-weightedness.  Better POSIX
+compliance would probably at least be better for compatibility with
+o{ther,lder} versions of bash.  Unfortunately there are quite a few
+bashism at the moment, so this may not be trivial.  For instance:
+
+      servo:~/cmrg/monkeysphere/git 0$ checkbashisms -f src/monkeysphere-server 2>&1 | wc -l
+      50
+      servo:~/cmrg/monkeysphere/git 0$ 
diff --git a/website/bugs/use_getopts_instead_of_getopt.mdwn b/website/bugs/use_getopts_instead_of_getopt.mdwn
new file mode 100644
index 0000000..db087b4
--- /dev/null
+++ b/website/bugs/use_getopts_instead_of_getopt.mdwn
@@ -0,0 +1,4 @@
+Since Monkeysphere is using bash, it would be nice to use the shell
+build in getopts function, instead of the external getopt program.
+This would reduce an external dependency, which would definitely be
+better for portability.
-- 
2.25.1