From 4ee039f3545976f9e3e25a7e5d7b58f1f2316dc3 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sun, 20 Feb 2011 22:24:28 -0500 Subject: [PATCH] avoid referencing address of extern function from vdprintf this change is in preparation for upcoming PIC/shared library support. the intent is to avoid going through the GOT, mainly so that dprintf is operable immediately, prior to processing of relocations. having dprintf accessible from the dynamic linker will make writing and debugging the dynamic linker much easier. --- src/stdio/vdprintf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/stdio/vdprintf.c b/src/stdio/vdprintf.c index bfb1b0a9..35ed6e0b 100644 --- a/src/stdio/vdprintf.c +++ b/src/stdio/vdprintf.c @@ -1,11 +1,16 @@ #include "stdio_impl.h" +static size_t wrap_write(FILE *f, const unsigned char *buf, size_t len) +{ + return __stdio_write(f, buf, len); +} + int vdprintf(int fd, const char *fmt, va_list ap) { int r; char buf[BUFSIZ]; FILE f = { - .fd = fd, .lbf = EOF, .write = __stdio_write, + .fd = fd, .lbf = EOF, .write = wrap_write, .buf = buf+UNGET, .buf_size = sizeof buf - UNGET }; r = vfprintf(&f, fmt, ap); -- 2.25.1