Fix bug: Using unsigned to detect errno<0

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@791 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 114 insertions, 39 deletions

diff --git a/nuttx/fs/fs_close.c b/nuttx/fs/fs_close.c
index c1f3322cc..736788a2e 100644
--- a/nuttx/fs/fs_close.c
+++ b/nuttx/fs/fs_close.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * fs_close.c
+ * fs/fs_close.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/nuttx/fs/fs_files.c b/nuttx/fs/fs_files.c
index 8ed7c615e..6f4941dce 100644
--- a/nuttx/fs/fs_files.c
+++ b/nuttx/fs/fs_files.c
@@ -1,7 +1,7 @@
-/************************************************************
- * fs_files.c
+/****************************************************************************
+ * fs/s_files.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,11 +31,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************/
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 #include <string.h>
@@ -47,25 +47,25 @@
 #include <nuttx/kmalloc.h>
 #include "fs_internal.h"
 
-/************************************************************
+/****************************************************************************
  * Definitions
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Public Types
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Private Variables
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Private Variables
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Private Functions
- ************************************************************/
+ ****************************************************************************/
 
 static void _files_semtake(FAR struct filelist *list)
 {
@@ -83,9 +83,9 @@ static void _files_semtake(FAR struct filelist *list)
 
 #define _files_semgive(list) sem_post(&list->fl_sem)
 
-/************************************************************
+/****************************************************************************
  * Pulblic Functions
- ************************************************************/
+ ****************************************************************************/
 
 /* This is called from the FS initialization logic to configure
  * the files.
@@ -191,42 +191,117 @@ int files_releaselist(FAR struct filelist *list)
 int files_dup(FAR struct file *filep1, FAR struct file *filep2)
 {
   FAR struct filelist *list;
+  FAR struct inode *inode;
+  int err;
+  int ret;
 
   if (!filep1 || !filep1->f_inode || !filep2)
     {
-      *get_errno_ptr() = EBADF;
-      return ERROR;
+      err = EBADF;
+      goto errout;
     }
 
+#ifndef CONFIG_DISABLE_MOUNTPOINT
+  if (INODE_IS_MOUNTPT(filep1->f_inode))
+    {
+      err = ENOSYS; /* Not yet supported */
+      goto errout;
+    }
+#endif
+
   list = sched_getfiles();
   if (!list)
     {
-      *get_errno_ptr() = EMFILE;
-      return ERROR;
+      err = EMFILE;
+      goto errout;
     }
 
   _files_semtake(list);
 
   /* If there is already an inode contained in the new file structure,
-   * release it (effectively closing the file).
+   * close the file and release the inode.
    */
 
-  if (filep2->f_inode)
+  inode = filep2->f_inode;
+  if (inode)
     {
+      /* Close the file, driver, or mountpoint. */
+
+      if (inode->u.i_ops && inode->u.i_ops->close)
+        {
+          /* Perform the close operation */
+
+          ret = inode->u.i_ops->close(filep2);
+          if (ret < 0)
+            {
+              /* An error occurred while closing the driver */
+
+              goto errout_with_ret;
+            }
+        }
+
+      /* Release the inode */
+
       inode_release(filep2->f_inode);
     }
 
   /* Increment the reference count on the contained inode */
 
-  inode_addref(filep1->f_inode);
+  inode = filep1->f_inode;
+  inode_addref(inode);
 
   /* Then clone the file structure */
 
   filep2->f_oflags = filep1->f_oflags;
   filep2->f_pos    = filep1->f_pos;
-  filep2->f_inode  = filep1->f_inode;
+  filep2->f_inode  = inode;
+
+  /* Call the open method on the file, driver, mountpoint so that it
+   * can maintain the correct open counts.
+   */
+
+  if (inode->u.i_ops && inode->u.i_ops->open)
+    {
+#ifndef CONFIG_DISABLE_MOUNTPOINT
+#if 0 /* Not implemented */
+      if (INODE_IS_MOUNTPT(inode))
+        {
+         /* Open a file on the mountpoint */
+
+          ret = inode->u.i_mops->open(filep2, ?, filep2->f_oflags, ?);
+        }
+      else
+#endif
+#endif
+        {
+          /* Open the psuedo file or device driver */
+
+          ret = inode->u.i_ops->open(filep2);
+        }
+
+      /* Handle open failures */
+
+      if (ret < 0)
+        {
+          goto errout_with_inode;
+        }
+    }
   _files_semgive(list);
   return OK;
+
+/* Handler various error conditions */
+
+errout_with_inode:
+  inode_release(filep2->f_inode);
+  filep2->f_oflags = 0;
+  filep2->f_pos    = 0;
+  filep2->f_inode  = NULL;
+errout_with_ret:
+  err              = -ret;
+  _files_semgive(list);
+errout:
+  errno            = err;
+  return ERROR;
 }
 
 /* Allocate a struct files instance and associate it with an
diff --git a/nuttx/fs/fs_open.c b/nuttx/fs/fs_open.c
index d07b73416..166471bfb 100644
--- a/nuttx/fs/fs_open.c
+++ b/nuttx/fs/fs_open.c
@@ -1,7 +1,7 @@
-/************************************************************
+/****************************************************************************
  * fs_open.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -14,7 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ * 3. Neither the name NuttX nor the names of its contributors may be
  *    used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -31,11 +31,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************/
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 #include <sys/types.h>
@@ -48,13 +48,13 @@
 #include <nuttx/fs.h>
 #include "fs_internal.h"
 
-/************************************************************
+/****************************************************************************
  * Private Functions
- ************************************************************/
+ ****************************************************************************/
 
-/************************************************************
+/****************************************************************************
  * Public Functions
- ************************************************************/
+ ****************************************************************************/
 
 int inode_checkflags(FAR struct inode *inode, int oflags)
 {