From 9dd25d79650d411a87ead641035dc9d6624628c5 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 27 May 2007 23:09:23 +0000 Subject: [PATCH] Remove duplicate definition of struct statfs git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@260 42af7a65-404d-4744-a932-0658087f49c3 --- Documentation/NuttxUserGuide.html | 12 +-- fs/fs_statfs.c | 168 ++++++++++++++++++++++++++++++ include/stdio.h | 11 -- 3 files changed, 174 insertions(+), 17 deletions(-) create mode 100644 fs/fs_statfs.c diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html index 3fd59357c3..46b4b2be44 100644 --- a/Documentation/NuttxUserGuide.html +++ b/Documentation/NuttxUserGuide.html @@ -21,7 +21,7 @@ User's Manual

Gregory Nutt

-Last Update: March 28, 2007 +Last Update: May 27, 2007

1.0 Introduction

@@ -5725,7 +5725,7 @@ notify a task when a message is available on a queue. int close(int fd); int dup(int fildes); int dup2(int fildes1, int fildes2); - off_t lseek(int fd, off_t offset, int whence); /* Prototyped but not implemented */ + off_t lseek(int fd, off_t offset, int whence); int read(int fd, void *buf, unsigned int nbytes); int unlink(const char *path); int write(int fd, const void *buf, unsigned int nbytes); @@ -5768,7 +5768,7 @@ notify a task when a message is available on a queue. int printf(const char *format, ...); int puts(const char *s); - int rename(const char *source, const char *target); /* Prototyped but not implemented */ + int rename(const char *source, const char *target); int sprintf(char *dest, const char *format, ...); int ungetc(int c, FILE *stream); int vprintf(const char *s, va_list ap); @@ -5779,9 +5779,9 @@ notify a task when a message is available on a queue. FILE *fdopen(int fd, const char *type); int fstat(int fd, FAR struct stat *buf); /* Prototyped but not implemented */ char *getcwd(FAR char *buf, size_t size); /* Prototyped but not implemented */ - int mkdir(const char *path, mode_t mode); /* Prototyped but not implemented */ - int rmdir(const char *path); /* Prototyped but not implemented */ - int stat(const char *path, FAR struct stat *buf); /* Prototyped but not implemented */ + int mkdir(const char *path, mode_t mode); + int rmdir(const char *path); + int stat(const char *path, FAR struct stat *buf); int statfs(const char *path, FAR struct statfs *buf); /* Prototyped but not implemented */ diff --git a/fs/fs_statfs.c b/fs/fs_statfs.c new file mode 100644 index 0000000000..24b9113ef1 --- /dev/null +++ b/fs/fs_statfs.c @@ -0,0 +1,168 @@ +/**************************************************************************** + * fs_statfs.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * 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 + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Compilation Switches + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include "fs_internal.h" + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +#if CONFIG_NFILE_DESCRIPTORS > 0 + +/**************************************************************************** + * Name: statpsuedo + ****************************************************************************/ + +static inline int statpsuedofs(FAR struct inode *inode, FAR struct statfs *buf) +{ + return OK; +} + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: stat + * + * Return: Zero on success; -1 on failure with errno set: + * + * EACCES Search permission is denied for one of the directories in the + * path prefix of path. + * EFAULT Bad address. + * ENOENT A component of the path path does not exist, or the path is an + * empty string. + * ENOMEM Out of memory + * ENOTDIR A component of the path is not a directory. + * ENOSYS The file system does not support this call. + * + ****************************************************************************/ + +int statfs(const char *path, struct statfs *buf) +{ + FAR struct inode *inode; + const char *relpath = NULL; + int ret; + + /* Sanity checks */ + + if (!path || !buf) + { + ret = EFAULT; + goto errout; + } + + if (!path[0]) + { + ret = ENOENT; + goto errout; + } + + /* Get an inode for this file */ + + inode = inode_find(path, &relpath); + if (!inode) + { + /* This name does not refer to a psudeo-inode and there is no + * mountpoint that includes in this path. + */ + + ret = ENOENT; + goto errout; + } + + /* The way we handle the stat depends on the type of inode that we + * are dealing with. + */ + +#ifndef CONFIG_DISABLE_MOUNTPOUNT + if (INODE_IS_MOUNTPT(inode)) + { + /* The node is a file system mointpoint. Verify that the mountpoint + * supports the stat() method + */ + + if (inode->u.i_mops && inode->u.i_mops->statfs) + { + /* Perform the rewinddir() operation */ + + ret = inode->u.i_mops->statfs(inode, relpath, buf); + } + } + else +#endif + { + /* The node is part of the root psuedo file system */ + + ret = statpsuedofs(inode, buf); + } + + /* Check if the stat operation was successful */ + + if (ret < 0) + { + ret = -ret; + goto errout_with_inode; + } + + /* Successfully stat'ed the file */ + + inode_release(inode); + return OK; + +/* Failure conditions always set the errno appropriately */ + + errout_with_inode: + inode_release(inode); + errout: + *get_errno_ptr() = ret; + return ERROR; +} + +#endif /* CONFIG_NFILE_DESCRIPTORS */ diff --git a/include/stdio.h b/include/stdio.h index 592ded26ae..ed6596286f 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -80,17 +80,6 @@ * Public Type Definitions ************************************************************/ -struct statfs -{ - long f_bavail; /* free blocks available to non-superuser */ - long f_bfree; /* free blocks */ - long f_blocks; /* total blocks in file system */ - long f_bsize; /* fundamental file system block (bytes) */ - long f_ffree; /* free file nodes in file system */ - long f_files; /* total file nodes in file system */ - long f_type; /* type of info, zero for now */ -}; - /* Streams */ typedef FAR struct file_struct FILE;