separate getc/putc from fgetc/fputc

for conformance, two functions should not have the same address. a
conforming program could use the addresses of getc and fgetc in ways
that assume they are distinct. normally i would just use a wrapper,
but these functions are so small and performance-critical that an
extra layer of function call could make the one that's a wrapper
nearly twice as slow, so I'm just duplicating the code instead.

diff --git a/src/stdio/fgetc.c b/src/stdio/fgetc.c
index 65a10fa..e122416 100644 (file)
--- a/src/stdio/fgetc.c
+++ b/src/stdio/fgetc.c
@@ -9,6 +9,3 @@ int fgetc(FILE *f)
        __unlockfile(f);
        return c;
 }
-
-weak_alias(fgetc, getc);
-weak_alias(fgetc, _IO_getc);

diff --git a/src/stdio/fputc.c b/src/stdio/fputc.c
index 9953296..92762c9 100644 (file)
--- a/src/stdio/fputc.c
+++ b/src/stdio/fputc.c
@@ -8,6 +8,3 @@ int fputc(int c, FILE *f)
        __unlockfile(f);
        return c;
 }
-
-weak_alias(fputc, putc);
-weak_alias(fputc, _IO_putc);

diff --git a/src/stdio/getc.c b/src/stdio/getc.c
new file mode 100644 (file)
index 0000000..b3f351d
--- /dev/null
+++ b/src/stdio/getc.c
@@ -0,0 +1,13 @@
+#include "stdio_impl.h"
+
+int getc(FILE *f)
+{
+       int c;
+       if (f->lock < 0 || !__lockfile(f))
+               return getc_unlocked(f);
+       c = getc_unlocked(f);
+       __unlockfile(f);
+       return c;
+}
+
+weak_alias(getc, _IO_getc);

diff --git a/src/stdio/putc.c b/src/stdio/putc.c
new file mode 100644 (file)
index 0000000..fa89349
--- /dev/null
+++ b/src/stdio/putc.c
@@ -0,0 +1,12 @@
+#include "stdio_impl.h"
+
+int putc(int c, FILE *f)
+{
+       if (f->lock < 0 || !__lockfile(f))
+               return putc_unlocked(c, f);
+       c = putc_unlocked(c, f);
+       __unlockfile(f);
+       return c;
+}
+
+weak_alias(putc, _IO_putc);