From e901ad81050519a7c1218e896a1ec62bbad37262 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Tue, 1 Oct 2013 15:33:53 +0200 Subject: [PATCH] Move the declaration of the FILE structure into its own header. --- libc/decl/FILE.h | 41 +---------------------- libc/include/FILE.h | 77 ++++++++++++++++++++++++++++++++++++++++++++ libc/include/stdio.h | 7 ++++ libc/include/wchar.h | 4 +++ 4 files changed, 89 insertions(+), 40 deletions(-) create mode 100644 libc/include/FILE.h diff --git a/libc/decl/FILE.h b/libc/decl/FILE.h index 8504b200..15d1a05e 100644 --- a/libc/decl/FILE.h +++ b/libc/decl/FILE.h @@ -1,43 +1,4 @@ #ifndef _FILE_DECL #define _FILE_DECL -#define BUFSIZ 8192UL -#define _FILE_REGISTERED (1<<0) -#define _FILE_BUFFER_MODE_SET (1<<1) -#define _FILE_LAST_WRITE (1<<2) -#define _FILE_LAST_READ (1<<3) -#define _FILE_AUTO_LOCK (1<<4) -#define _FILE_STREAM (1<<5) -#define _FILE_BUFFER_OWNED (1<<6) -#define _FILE_MAX_PUSHBACK 8 -typedef struct _FILE -{ - /* This is non-standard, but useful. If you allocate your own FILE and - register it with fregister, feel free to use modify the following members - to customize how it works. Don't call the functions directly, though, as - the standard library does various kinds of buffering and conversion. */ - size_t buffersize; - unsigned char* buffer; - void* user; - void* free_user; - int (*reopen_func)(void* user, const char* mode); - size_t (*read_func)(void* ptr, size_t size, size_t nmemb, void* user); - size_t (*write_func)(const void* ptr, size_t size, size_t nmemb, void* user); - int (*seek_func)(void* user, off_t offset, int whence); - off_t (*tell_func)(void* user); - void (*seterr_func)(void* user); - void (*clearerr_func)(void* user); - int (*eof_func)(void* user); - int (*error_func)(void* user); - int (*fileno_func)(void* user); - int (*close_func)(void* user); - void (*free_func)(void* free_user, struct _FILE* fp); - /* Application writers shouldn't use anything beyond this point. */ - struct _FILE* prev; - struct _FILE* next; - int flags; - int buffer_mode; - size_t offset_input_buffer; - size_t amount_input_buffered; - size_t amount_output_buffered; -} FILE; +typedef struct FILE FILE; #endif diff --git a/libc/include/FILE.h b/libc/include/FILE.h new file mode 100644 index 00000000..365969a2 --- /dev/null +++ b/libc/include/FILE.h @@ -0,0 +1,77 @@ +/******************************************************************************* + + Copyright(C) Jonas 'Sortie' Termansen 2011, 2012, 2013. + + This file is part of the Sortix C Library. + + The Sortix C Library is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + The Sortix C Library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with the Sortix C Library. If not, see . + + FILE.h + The FILE structure from + +*******************************************************************************/ + +#ifndef INCLUDE_FILE_H +#define INCLUDE_FILE_H + +#include + +#include + +@include(off_t.h) +@include(size_t.h) +@include(FILE.h) + +#define _FILE_REGISTERED (1<<0) +#define _FILE_BUFFER_MODE_SET (1<<1) +#define _FILE_LAST_WRITE (1<<2) +#define _FILE_LAST_READ (1<<3) +#define _FILE_AUTO_LOCK (1<<4) +#define _FILE_STREAM (1<<5) +#define _FILE_BUFFER_OWNED (1<<6) +#define _FILE_MAX_PUSHBACK 8 + +struct FILE +{ + /* This is non-standard, but useful. If you allocate your own FILE and + register it with fregister, feel free to use modify the following members + to customize how it works. Don't call the functions directly, though, as + the standard library does various kinds of buffering and conversion. */ + size_t buffersize; + unsigned char* buffer; + void* user; + void* free_user; + int (*reopen_func)(void* user, const char* mode); + size_t (*read_func)(void* ptr, size_t size, size_t nmemb, void* user); + size_t (*write_func)(const void* ptr, size_t size, size_t nmemb, void* user); + int (*seek_func)(void* user, off_t offset, int whence); + off_t (*tell_func)(void* user); + void (*seterr_func)(void* user); + void (*clearerr_func)(void* user); + int (*eof_func)(void* user); + int (*error_func)(void* user); + int (*fileno_func)(void* user); + int (*close_func)(void* user); + void (*free_func)(void* free_user, struct FILE* fp); + /* Application writers shouldn't use anything beyond this point. */ + struct FILE* prev; + struct FILE* next; + int flags; + int buffer_mode; + size_t offset_input_buffer; + size_t amount_input_buffered; + size_t amount_output_buffered; +}; + +#endif diff --git a/libc/include/stdio.h b/libc/include/stdio.h index 2ec04974..6c547397 100644 --- a/libc/include/stdio.h +++ b/libc/include/stdio.h @@ -35,6 +35,10 @@ #endif #include +#if __is_sortix_libc +#include +#endif + __BEGIN_DECLS @include(off_t.h) @@ -61,6 +65,9 @@ typedef off_t fpos_t; /* Default path prefix for `tempnam' and `tmpnam'. */ #define P_tmpdir "/tmp" +/* Size of buffers. */ +#define BUFSIZ 8192UL + extern FILE* stdin; extern FILE* stdout; extern FILE* stderr; diff --git a/libc/include/wchar.h b/libc/include/wchar.h index c345ba2d..36a3f43a 100644 --- a/libc/include/wchar.h +++ b/libc/include/wchar.h @@ -29,6 +29,10 @@ #include +#if __is_sortix_libc +#include +#endif + __BEGIN_DECLS @include(size_t.h)