Skip to content

Commit

Permalink
LibC: Move FILE definition to bits/FILE.h
Browse files Browse the repository at this point in the history
There are some headers in libc that require us to have definitions,
such as `FILE` available to us (such as in `pwd.h`). It is bad
practice to include the entirety of `stdio.h`, so it makes more
sense to put `FILE` into it's own header.
  • Loading branch information
Quaker762 authored and awesomekling committed Feb 2, 2020
1 parent 117820f commit cdbdd39
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 17 deletions.
53 changes: 53 additions & 0 deletions Libraries/LibC/bits/FILE.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Copyright (c) 2018-2020, Jesse Buhagiar <[email protected]>
* All rights reserved.
*
* 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.
*
* 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 HOLDER 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.
*/


#pragma once

#include <sys/cdefs.h>
#include <sys/types.h>

#define BUFSIZ 1024

__BEGIN_DECLS

struct __STDIO_FILE {
int fd;
int eof;
int error;
int mode;
pid_t popen_child;
char* buffer;
size_t buffer_size;
size_t buffer_index;
int have_ungotten;
char ungotten;
char default_buffer[BUFSIZ];
};

typedef struct __STDIO_FILE FILE;

__END_DECLS
18 changes: 1 addition & 17 deletions Libraries/LibC/stdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@

#include <limits.h>
#include <stdarg.h>
#include <bits/FILE.h>
#include <sys/cdefs.h>
#include <sys/types.h>

#define FILENAME_MAX 1024
#define BUFSIZ 1024

__BEGIN_DECLS
#ifndef EOF
Expand All @@ -51,22 +51,6 @@ __BEGIN_DECLS

#define L_tmpnam 256

struct __STDIO_FILE {
int fd;
int eof;
int error;
int mode;
pid_t popen_child;
char* buffer;
size_t buffer_size;
size_t buffer_index;
int have_ungotten;
char ungotten;
char default_buffer[BUFSIZ];
};

typedef struct __STDIO_FILE FILE;

extern FILE* stdin;
extern FILE* stdout;
extern FILE* stderr;
Expand Down

0 comments on commit cdbdd39

Please sign in to comment.