diff --git a/ChangeLog b/ChangeLog index 4a5a84d52a..a98bfa9b9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -315,7 +315,7 @@ * Added a test case to verify the Pascal P-Code interpreter * Added /dev/zero * 'errno' is now defined to be *get_errno_ptr() with no name conflicts - * Added lseek() + * Added lseek() and fseek() diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 9fd1c534be..e1db573b7a 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -965,7 +965,7 @@ Other memory: * Added a test case to verify the Pascal P-Code interpreter * Added /dev/zero * 'errno' is now defined to be *get_errno_ptr() with no name conflicts - * Added lseek() + * Added lseek() and fseek() diff --git a/examples/pashello/device.c b/examples/pashello/device.c index 6231a84984..b157965c7f 100644 --- a/examples/pashello/device.c +++ b/examples/pashello/device.c @@ -93,6 +93,7 @@ static ssize_t hello_read(struct file *filp, char *buffer, size_t len) nread = hello_pex_len - offset; } memcpy(buffer, &hello_pex[offset], nread); + filep->f_pos += nread; } return nread; } diff --git a/lib/Makefile b/lib/Makefile index a0a4e28072..96ceb3a021 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -59,9 +59,10 @@ STDIO_SRCS = lib_printf.c lib_rawprintf.c lib_lowprintf.c lib_dbg.c \ ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) STDIO_SRCS += lib_rawstream.c ifneq ($(CONFIG_NFILE_STREAMS),0) -STDIO_SRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fgetc.c lib_fgets.c \ - lib_gets.c lib_fwrite.c lib_libfwrite.c lib_fflush.c lib_fputc.c lib_puts.c \ - lib_fputs.c lib_ungetc.c lib_vprintf.c lib_fprintf.c lib_vfprintf.c lib_stdstream.c +STDIO_SRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \ + lib_fgetc.c lib_fgets.c lib_gets.c lib_fwrite.c lib_libfwrite.c \ + lib_fflush.c lib_fputc.c lib_puts.c lib_fputs.c lib_ungetc.c \ + lib_vprintf.c lib_fprintf.c lib_vfprintf.c lib_stdstream.c endif endif diff --git a/lib/lib_fread.c b/lib/lib_fread.c index 61e3daa5fe..361385bbaf 100644 --- a/lib/lib_fread.c +++ b/lib/lib_fread.c @@ -1,7 +1,7 @@ -/************************************************************ - * lib_fread.c +/**************************************************************************** + * lib/lib_fread.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * 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,53 +31,54 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Compilation Switches - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + ****************************************************************************/ #include #include "lib_internal.h" -/************************************************************ +/**************************************************************************** * Definitions - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Type Declarations - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Function Prototypes - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Constant Data - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Global Variables - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Constant Data - ************************************************************/ + ****************************************************************************/ -/************************************************************ +/**************************************************************************** * Private Variables - ************************************************************/ -/************************************************************ - * Global Functions - ************************************************************/ + ****************************************************************************/ -/************************************************************ - * fwrite - ************************************************************/ +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: fwrite + ****************************************************************************/ size_t fread(void *ptr, size_t size, size_t n_items, FILE *stream) { diff --git a/lib/lib_fseek.c b/lib/lib_fseek.c new file mode 100644 index 0000000000..a770f8f304 --- /dev/null +++ b/lib/lib_fseek.c @@ -0,0 +1,92 @@ +/**************************************************************************** + * lib/lib_fseek.c + * + * Copyright (C) 2007, 2008 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 NuttX 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 "lib_internal.h" + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Type Declarations + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Global Constant Data + ****************************************************************************/ + +/**************************************************************************** + * Global Variables + ****************************************************************************/ + +/**************************************************************************** + * Private Constant Data + ****************************************************************************/ + +/**************************************************************************** + * Private Variables + ****************************************************************************/ + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: fseek + ****************************************************************************/ + +int fseek(FILE *stream, long int offset, int whence) +{ + /* Perform the fseek on the underlying file descriptor */ + + return lseek(stream->fs_filedes, offset, whence) >= 0 ? OK : ERROR; +} + +