aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-01 20:20:26 +0000
committerMike Frysinger <vapier@gentoo.org>2016-01-07 04:25:54 -0500
commit45c4f3665aaa63cab148cc9cc96fa07c666c1c38 (patch)
treed45a98d97c13ce603b233208f0cf37440137fd29
parent48d0341cdd41040714f1e9896efe89d49296bc78 (diff)
downloadtermbaud-45c4f3665aaa63cab148cc9cc96fa07c666c1c38.tar.gz
termbaud-45c4f3665aaa63cab148cc9cc96fa07c666c1c38.tar.xz
termbaud-45c4f3665aaa63cab148cc9cc96fa07c666c1c38.zip
argp: Use fwrite_unlocked instead of __fxprintf when !_LIBC
__fxprintf is not available when argp is built outside libc. gnulib has the same logic already.
-rw-r--r--ChangeLog5
-rw-r--r--argp/argp-fmtstream.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dc2a942a8c..67f21816bfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-07 Khem Raj <raj.khem@gmail.com>
+
+ * argp/argp-fmtstream.c (__argp_fmtstream_free): Use fwrite_unlocked
+ instead of __fxprintf when _LIBC is undefined.
+
2016-01-07 Marko Myllynen <myllynen@redhat.com>
* catgets/test-gencat.sh: Remove space after shebang.
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index 982db4e7c86..d951a962e3d 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -100,7 +100,11 @@ __argp_fmtstream_free (argp_fmtstream_t fs)
__argp_fmtstream_update (fs);
if (fs->p > fs->buf)
{
+#ifdef _LIBC
__fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
+#else
+ fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+#endif
}
free (fs->buf);
free (fs);