aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2002-08-13 05:09:18 +0000
committerH. Peter Anvin <hpa@zytor.com>2002-08-13 05:09:18 +0000
commitac323a2d2e69bbb051c9cf81f22a10b2f38350b2 (patch)
treee07c869dc56ff5dff0caf98a2900df975700ed06
parente77ea6f04eb774ef5b3fd480980a0d200829a754 (diff)
downloadklibc-ac323a2d2e69bbb051c9cf81f22a10b2f38350b2.tar.gz
Define fopen() in terms of fdopen(); define fdopen() as a macroklibc-0.29
-rw-r--r--fopen.c2
-rw-r--r--include/stdio.h4
-rw-r--r--klibc/fopen.c2
-rw-r--r--klibc/include/stdio.h4
4 files changed, 10 insertions, 2 deletions
diff --git a/fopen.c b/fopen.c
index 9a87e41aefc17..5c84184809af4 100644
--- a/fopen.c
+++ b/fopen.c
@@ -42,5 +42,5 @@ FILE *fopen(const char *file, const char *mode)
if ( fd < 0 )
return NULL;
else
- return __create_file(fd);
+ return fdopen(fd, mode);
}
diff --git a/include/stdio.h b/include/stdio.h
index 92ed478f3b734..d6f0c1d588be2 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -44,6 +44,10 @@ static __inline__ FILE * __create_file(int __fd)
__extern FILE *fopen(const char *, const char *);
+static __inline__ FILE *fdopen(int __fd, const char *__m)
+{
+ return __create_file(__fd);
+}
static __inline__ int fclose(FILE *__f)
{
extern int close(int);
diff --git a/klibc/fopen.c b/klibc/fopen.c
index 9a87e41aefc17..5c84184809af4 100644
--- a/klibc/fopen.c
+++ b/klibc/fopen.c
@@ -42,5 +42,5 @@ FILE *fopen(const char *file, const char *mode)
if ( fd < 0 )
return NULL;
else
- return __create_file(fd);
+ return fdopen(fd, mode);
}
diff --git a/klibc/include/stdio.h b/klibc/include/stdio.h
index 92ed478f3b734..d6f0c1d588be2 100644
--- a/klibc/include/stdio.h
+++ b/klibc/include/stdio.h
@@ -44,6 +44,10 @@ static __inline__ FILE * __create_file(int __fd)
__extern FILE *fopen(const char *, const char *);
+static __inline__ FILE *fdopen(int __fd, const char *__m)
+{
+ return __create_file(__fd);
+}
static __inline__ int fclose(FILE *__f)
{
extern int close(int);