From 29d65eb866a4bac12774ae3d8b7531a64d7067ba Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 20 Jan 2016 14:41:27 -0600
Subject: [PATCH] apps/fsutils/passwd: Fix a few more errors found in
 integration

---
 fsutils/passwd/passwd.h         |  8 +++++---
 fsutils/passwd/passwd_adduser.c |  2 +-
 fsutils/passwd/passwd_deluser.c |  2 +-
 fsutils/passwd/passwd_update.c  |  2 +-
 fsutils/passwd/passwd_verify.c  |  2 +-
 include/fsutils/passwd.h        | 13 +++++++++++--
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/fsutils/passwd/passwd.h b/fsutils/passwd/passwd.h
index 57c3427aa..03cac3286 100644
--- a/fsutils/passwd/passwd.h
+++ b/fsutils/passwd/passwd.h
@@ -86,12 +86,14 @@ struct passwd_s
  *
  ****************************************************************************/
 
-#if CONFIG_FS_WRITABLE
+#if defined(CONFIG_FS_WRITABLE) && !defined(CONFIG_FSUTILS_PASSWD_READONLY)
+#  define PASSWD_SEM_DECL(s) FAR sem_t *s
 int passwd_lock(FAR sem_t **semp);
 int passwd_unlock(FAR sem_t *sem);
 #else
-# define passwd_lock(semp)  (0)
-# define passwd_unlock(sem) (0)
+#  define PASSWD_SEM_DECL(s)
+#  define passwd_lock(semp)  (0)
+#  define passwd_unlock(sem) (0)
 #endif
 
 /****************************************************************************
diff --git a/fsutils/passwd/passwd_adduser.c b/fsutils/passwd/passwd_adduser.c
index b37c30f29..79462bbda 100644
--- a/fsutils/passwd/passwd_adduser.c
+++ b/fsutils/passwd/passwd_adduser.c
@@ -67,7 +67,7 @@
 int passwd_adduser(FAR const char *username, FAR const char *password)
 {
   struct passwd_s passwd;
-  FAR sem_t *sem;
+  PASSWD_SEM_DECL(sem);
   int ret;
 
   /* Get exclusive access to the /etc/passwd file */
diff --git a/fsutils/passwd/passwd_deluser.c b/fsutils/passwd/passwd_deluser.c
index a6df2807a..b474538d7 100644
--- a/fsutils/passwd/passwd_deluser.c
+++ b/fsutils/passwd/passwd_deluser.c
@@ -66,7 +66,7 @@
 int passwd_deluser(FAR const char *username)
 {
   struct passwd_s passwd;
-  FAR sem_t *sem;
+  PASSWD_SEM_DECL(sem);
   int ret;
 
   /* Get exclusive access to the /etc/passwd file */
diff --git a/fsutils/passwd/passwd_update.c b/fsutils/passwd/passwd_update.c
index 8f54d9acc..929157730 100644
--- a/fsutils/passwd/passwd_update.c
+++ b/fsutils/passwd/passwd_update.c
@@ -64,7 +64,7 @@
 int passwd_update(FAR const char *username, FAR const char *password)
 {
   struct passwd_s passwd;
-  FAR sem_t *sem;
+  PASSWD_SEM_DECL(sem);
   int ret;
 
   /* Get exclusive access to the /etc/passwd file */
diff --git a/fsutils/passwd/passwd_verify.c b/fsutils/passwd/passwd_verify.c
index 139109760..bee7e8784 100644
--- a/fsutils/passwd/passwd_verify.c
+++ b/fsutils/passwd/passwd_verify.c
@@ -67,7 +67,7 @@ int passwd_verify(FAR const char *username, FAR const char *password)
 {
   struct passwd_s passwd;
   char encrypted[MAX_ENCRYPTED + 1];
-  FAR sem_t *sem;
+  PASSWD_SEM_DECL(sem);
   int ret;
 
   /* Get exclusive access to the /etc/passwd file */
diff --git a/include/fsutils/passwd.h b/include/fsutils/passwd.h
index 1925de601..e5f0174cb 100644
--- a/include/fsutils/passwd.h
+++ b/include/fsutils/passwd.h
@@ -43,7 +43,15 @@
 #include <nuttx/config.h>
 #include <nuttx/compiler.h>
 
-#if defined(CONFIG_FS_WRITABLE) && defined(CONFIG_FSUTILS_PASSWD_READONLY)
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* passwd_verify() return value tests */
+
+#define PASSWORD_VERIFY_MATCH(ret)   (ret == 1)
+#define PASSWORD_VERIFY_NOMATCH(ret) (ret == 0)
+#define PASSWORD_VERIFY_ERROR(ret)   (ret < 0)
 
 /****************************************************************************
  * Public Function Prototypes
@@ -66,6 +74,7 @@
  *
  ****************************************************************************/
 
+#if defined(CONFIG_FS_WRITABLE) && defined(CONFIG_FSUTILS_PASSWD_READONLY)
 int passwd_adduser(FAR const char *username, FAR const char *password);
 
 /****************************************************************************
@@ -104,6 +113,7 @@ int passwd_deluser(FAR const char *username);
  ****************************************************************************/
 
 int passwd_update(FAR const char *username, FAR const char *password);
+#endif /* CONFIG_FS_WRITABLE && CONFIG_FSUTILS_PASSWD_READONLY */
 
 /****************************************************************************
  * Name: passwd_verify
@@ -125,5 +135,4 @@ int passwd_update(FAR const char *username, FAR const char *password);
 
 int passwd_verify(FAR const char *username, FAR const char *password);
 
-#endif /* CONFIG_FS_WRITABLE && CONFIG_FSUTILS_PASSWD_READONLY */
 #endif /* __APPS_INCLUDE_FSUTILS_PASSWD_H */