summaryrefslogtreecommitdiff
path: root/src/stdio
diff options
context:
space:
mode:
Diffstat (limited to 'src/stdio')
-rw-r--r--src/stdio/__printf.c15
-rw-r--r--src/stdio/__stdio.c6
-rw-r--r--src/stdio/_stdio.h19
-rw-r--r--src/stdio/fopen_s.c2
-rw-r--r--src/stdio/fprintf_s.c4
-rw-r--r--src/stdio/freopen_s.c2
-rw-r--r--src/stdio/fscanf_s.c5
-rw-r--r--src/stdio/gets.c2
-rw-r--r--src/stdio/gets_s.c2
-rw-r--r--src/stdio/pclose.c4
-rw-r--r--src/stdio/popen.c10
-rw-r--r--src/stdio/printf_s.c4
-rw-r--r--src/stdio/putc_unlocked.c2
-rw-r--r--src/stdio/scanf_s.c4
-rw-r--r--src/stdio/snprintf.c2
-rw-r--r--src/stdio/snprintf_s.c2
-rw-r--r--src/stdio/sprintf_s.c4
-rw-r--r--src/stdio/sscanf_s.c4
-rw-r--r--src/stdio/tmpfile_s.c2
-rw-r--r--src/stdio/tmpnam_s.c2
-rw-r--r--src/stdio/vfprintf_s.c2
-rw-r--r--src/stdio/vfscanf_s.c2
-rw-r--r--src/stdio/vprintf.c2
-rw-r--r--src/stdio/vprintf_s.c2
-rw-r--r--src/stdio/vscanf_s.c2
-rw-r--r--src/stdio/vsnprintf.c2
-rw-r--r--src/stdio/vsprintf_s.c2
-rw-r--r--src/stdio/vsscanf.c2
-rw-r--r--src/stdio/vsscanf_s.c2
29 files changed, 51 insertions, 64 deletions
diff --git a/src/stdio/__printf.c b/src/stdio/__printf.c
index 7da38752..ad266e2c 100644
--- a/src/stdio/__printf.c
+++ b/src/stdio/__printf.c
@@ -1,12 +1,13 @@
-#include "stdio.h"
-#include "_stdio.h"
-#include "stddef.h"
+#include <sys/types.h>
+#include <stdio.h>
+#include <stddef.h>
#include "wctype/wint_t.h"
#include "wctype/wctrans_t.h"
-#include "wchar.h"
-#include "inttypes.h"
-#include "unistd.h"
-#include "stdlib.h"
+#include <wchar.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "_stdio.h"
#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199909L
#include "stdint/intmax_t.h"
diff --git a/src/stdio/__stdio.c b/src/stdio/__stdio.c
index 57843a30..116c6ab9 100644
--- a/src/stdio/__stdio.c
+++ b/src/stdio/__stdio.c
@@ -1,7 +1,3 @@
#include "_stdio.h"
-struct __stdio __stdio =
-{
- { { 0 } },
- "/dev/tty",
-};
+struct __stdio __stdio = { 0 };
diff --git a/src/stdio/_stdio.h b/src/stdio/_stdio.h
index f7424806..80b83556 100644
--- a/src/stdio/_stdio.h
+++ b/src/stdio/_stdio.h
@@ -11,16 +11,15 @@
#include "sys/types/pid_t.h"
#endif
-#ifndef L_ctermid
-#include "L_ctermid.h"
+#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 199506L
+#define flockfile(_file) (void)(_file)
+#define funlockfile(_file) (void)(_file)
+#define putc_unlocked(_c, _stream) fputc(_c, _stream)
+#define getc_unlocked(_stream) fgetc(_stream)
#endif
#define f_is_open(s) (s && (s->bmode != 0))
-struct __fpos_t {
- size_t off;
-};
-
struct __FILE {
fpos_t pos;
@@ -62,16 +61,8 @@ int __scanf(struct io_options * restrict, const char * restrict, va_list);
struct __stdio {
struct __FILE FILES[FOPEN_MAX];
- char ctermid[L_ctermid + 1];
};
extern struct __stdio __stdio;
-#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 199506L
-#define flockfile(_file) (void)(_file)
-#define funlockfile(_file) (void)(_file)
-#define putc_unlocked(_c, _stream) fputc(_c, _stream)
-#define getc_unlocked(_stream) fgetc(_stream)
-#endif
-
#endif
diff --git a/src/stdio/fopen_s.c b/src/stdio/fopen_s.c
index 59385515..904c3584 100644
--- a/src/stdio/fopen_s.c
+++ b/src/stdio/fopen_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
#include "__stdio.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/stdio/fprintf_s.c b/src/stdio/fprintf_s.c
index b633dee8..74995abc 100644
--- a/src/stdio/fprintf_s.c
+++ b/src/stdio/fprintf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
/** write formatted output to a file stream **/
int fprintf_s(FILE * restrict stream, const char * restrict format, ...)
diff --git a/src/stdio/freopen_s.c b/src/stdio/freopen_s.c
index d646bec8..d6fae14f 100644
--- a/src/stdio/freopen_s.c
+++ b/src/stdio/freopen_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
#include "__stdio.h"
#include <fcntl.h>
#include <string.h>
diff --git a/src/stdio/fscanf_s.c b/src/stdio/fscanf_s.c
index de7f9e98..a0b40ba7 100644
--- a/src/stdio/fscanf_s.c
+++ b/src/stdio/fscanf_s.c
@@ -1,6 +1,5 @@
-#include "stdio.h"
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
/** read formatted input from a file stream **/
int fscanf_s(FILE * restrict stream, const char * restrict format, ...)
diff --git a/src/stdio/gets.c b/src/stdio/gets.c
index 8ad0998a..09f6ad3a 100644
--- a/src/stdio/gets.c
+++ b/src/stdio/gets.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include "limits.h"
+#include <limits.h>
/** read a line from stdin **/
diff --git a/src/stdio/gets_s.c b/src/stdio/gets_s.c
index 5af016dd..88434c40 100644
--- a/src/stdio/gets_s.c
+++ b/src/stdio/gets_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
#include <limits.h>
/** read a line from stdin **/
diff --git a/src/stdio/pclose.c b/src/stdio/pclose.c
index 258fc902..a9a89517 100644
--- a/src/stdio/pclose.c
+++ b/src/stdio/pclose.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include "sys/types.h"
-#include "sys/wait.h"
+#include <sys/types.h>
+#include <sys/wait.h>
#include "_stdio.h"
int pclose(FILE * stream)
diff --git a/src/stdio/popen.c b/src/stdio/popen.c
index 0e3ee7dd..dd338519 100644
--- a/src/stdio/popen.c
+++ b/src/stdio/popen.c
@@ -1,15 +1,15 @@
#include <stdio.h>
-#include "string.h"
-#include "errno.h"
+#include <string.h>
+#include <errno.h>
-#include "sys/types.h"
-#include "unistd.h"
+#include <sys/types.h>
+#include <unistd.h"
#include "_assert.h"
#include "_stdio.h"
#ifdef __STDC_VERSION__
-#include "wchar.h"
+#include <wchar.h>
#endif
FILE * popen(const char * command, const char * mode)
diff --git a/src/stdio/printf_s.c b/src/stdio/printf_s.c
index b5917062..bb49bb6f 100644
--- a/src/stdio/printf_s.c
+++ b/src/stdio/printf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
/** write formatted output **/
int printf_s(const char *format, ...)
diff --git a/src/stdio/putc_unlocked.c b/src/stdio/putc_unlocked.c
index 4a3937e8..c6fec42c 100644
--- a/src/stdio/putc_unlocked.c
+++ b/src/stdio/putc_unlocked.c
@@ -7,7 +7,7 @@
#include <unistd.h>
#else
#include "_syscall.h"
-#define write(_fd, _buf, _size) __syscall(__syscall_lookup(write), _fd, _buf, _size)
+#define write(_fd, _buf, _size) __scall3(write, _fd, _buf, _size)
#endif
/** write a character to a file stream with explicit client locking **/
diff --git a/src/stdio/scanf_s.c b/src/stdio/scanf_s.c
index f67335f7..78ac5cca 100644
--- a/src/stdio/scanf_s.c
+++ b/src/stdio/scanf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
/** read formatted input **/
int scanf_s(const char * restrict format, ...)
diff --git a/src/stdio/snprintf.c b/src/stdio/snprintf.c
index 966883eb..44bb65fe 100644
--- a/src/stdio/snprintf.c
+++ b/src/stdio/snprintf.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
#include "_stdio.h"
int snprintf(char * restrict s, size_t n, const char * restrict format, ...)
diff --git a/src/stdio/snprintf_s.c b/src/stdio/snprintf_s.c
index dcbdafaa..9ed36fcc 100644
--- a/src/stdio/snprintf_s.c
+++ b/src/stdio/snprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
int snprintf_s( char * restrict s, rsize_t n, const char * restrict format, ...)
{
diff --git a/src/stdio/sprintf_s.c b/src/stdio/sprintf_s.c
index 223e84c8..c103e179 100644
--- a/src/stdio/sprintf_s.c
+++ b/src/stdio/sprintf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
/** write formatted output to a string **/
int sprintf_s(char * restrict s, rsize_t n, const char * restrict format, ...)
diff --git a/src/stdio/sscanf_s.c b/src/stdio/sscanf_s.c
index c91786f6..b3824825 100644
--- a/src/stdio/sscanf_s.c
+++ b/src/stdio/sscanf_s.c
@@ -1,5 +1,5 @@
-#include "stdio.h"
-#include "stdarg.h"
+#include <stdio.h>
+#include <stdarg.h>
/** read formatted input from a string **/
int sscanf_s(const char * restrict s, const char * restrict format, ...)
diff --git a/src/stdio/tmpfile_s.c b/src/stdio/tmpfile_s.c
index 948425ad..ea846493 100644
--- a/src/stdio/tmpfile_s.c
+++ b/src/stdio/tmpfile_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
/* open a temporary file stream */
errno_t tmpfile_s(FILE * restrict * restrict streamptr)
diff --git a/src/stdio/tmpnam_s.c b/src/stdio/tmpnam_s.c
index 176eb982..6a20f93d 100644
--- a/src/stdio/tmpnam_s.c
+++ b/src/stdio/tmpnam_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
/** generate a temporary file name **/
errno_t tmpnam_s(char *s, rsize_t maxsize)
diff --git a/src/stdio/vfprintf_s.c b/src/stdio/vfprintf_s.c
index e2d94c71..f6b8c334 100644
--- a/src/stdio/vfprintf_s.c
+++ b/src/stdio/vfprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
#include "__stdio.h"
#include <stdarg.h>
diff --git a/src/stdio/vfscanf_s.c b/src/stdio/vfscanf_s.c
index 82fb238c..726d9508 100644
--- a/src/stdio/vfscanf_s.c
+++ b/src/stdio/vfscanf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
int vfscanf_s(FILE * restrict stream, const char * restrict format, va_list arg)
{
diff --git a/src/stdio/vprintf.c b/src/stdio/vprintf.c
index 7650c066..a27a8d73 100644
--- a/src/stdio/vprintf.c
+++ b/src/stdio/vprintf.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
#include "_stdio.h"
/** write formatted output **/
diff --git a/src/stdio/vprintf_s.c b/src/stdio/vprintf_s.c
index c13b1ead..dd65f66a 100644
--- a/src/stdio/vprintf_s.c
+++ b/src/stdio/vprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
/** write formatted output **/
int vprintf_s(const char * restrict format, va_list arg)
diff --git a/src/stdio/vscanf_s.c b/src/stdio/vscanf_s.c
index 85f34e07..7f154f30 100644
--- a/src/stdio/vscanf_s.c
+++ b/src/stdio/vscanf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
int vscanf_s(const char * restrict format, va_list arg)
{
diff --git a/src/stdio/vsnprintf.c b/src/stdio/vsnprintf.c
index b7785f89..62963b2c 100644
--- a/src/stdio/vsnprintf.c
+++ b/src/stdio/vsnprintf.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
#include "_stdio.h"
int vsnprintf(char * restrict s, size_t n, const char *format, va_list arg)
diff --git a/src/stdio/vsprintf_s.c b/src/stdio/vsprintf_s.c
index 98a7794f..5179c7e6 100644
--- a/src/stdio/vsprintf_s.c
+++ b/src/stdio/vsprintf_s.c
@@ -1,4 +1,4 @@
-#include "stdio.h"
+#include <stdio.h>
#include <stdarg.h>
#include <stdint.h>
diff --git a/src/stdio/vsscanf.c b/src/stdio/vsscanf.c
index a1248beb..2573b213 100644
--- a/src/stdio/vsscanf.c
+++ b/src/stdio/vsscanf.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include "stdarg.h"
+#include <stdarg.h>
#include "_stdio.h"
int vsscanf(const char * restrict s, const char * restrict format, va_list arg)
diff --git a/src/stdio/vsscanf_s.c b/src/stdio/vsscanf_s.c
index 6ac2e6fa..1039a9d5 100644
--- a/src/stdio/vsscanf_s.c
+++ b/src/stdio/vsscanf_s.c
@@ -1,4 +1,4 @@
-#include "stdarg.h"
+#include <stdarg.h>
int vsscanf_s(const char * restrict s, const char * restrict format, va_list arg)
{
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-23 11:05:56 +0000