The vwarnx(3) is probably not available in all libc implementations, in such
cases use the earlier printout as a fallback.
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
configure.ac | 1 +
sys-utils/ldattach.c | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index c76c2a0f3..38b968878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,6 +428,7 @@ AC_CHECK_FUNCS([ \
sysinfo \
timegm \
usleep \
+ vwarnx \
warn \
warnx \
])
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index eb04b5e33..d33d68535 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -137,11 +137,15 @@ static void dbg(char *fmt, ...)
if (debug == 0)
return;
fflush(NULL);
- fprintf(stderr, "%s: ", program_invocation_short_name);
va_start(args, fmt);
+#ifdef HAVE_VWARNX
+ vwarnx(fmt, args);
+#else
+ fprintf(stderr, "%s: ", program_invocation_short_name);
vfprintf(stderr, fmt, args);
- va_end(args);
fprintf(stderr, "\n");
+#endif
+ va_end(args);
fflush(NULL);
return;
}
@@ -252,7 +256,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
static void handler(int s)
{
- dbg("got SIG %i -> exiting\n", s);
+ dbg("got SIG %i -> exiting", s);
exit(EXIT_SUCCESS);
}
--
2.13.3
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
