1b47bd987f
Replace first patch (which is not in master after nearly 4 years) with
a new set of pending patches to fix the following build failure with
gcc >= 7:
liboping.c: In function 'ping_set_ttl':
liboping.c:207:9: error: '%s' directive output may be truncated writing up to 255 bytes into a region of size 242 [-Werror=format-truncation=]
207 | "%s: %s", function, message);
| ^~
......
829 | sstrerror (ret, errbuf, sizeof (errbuf)));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
liboping.c:206:2: note: 'snprintf' output between 15 and 270 bytes into a destination of size 256
206 | snprintf (obj->errmsg, sizeof (obj->errmsg),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
207 | "%s: %s", function, message);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/31083354e9064b2deef86917d67e92a88af0fa46
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From dfbdd324769f542b6b89499c1b7f0f4322100bc6 Mon Sep 17 00:00:00 2001
|
|
From: wfaulk <wfaulk@users.noreply.github.com>
|
|
Date: Wed, 7 Aug 2019 18:57:43 -0400
|
|
Subject: [PATCH] fix utf8 support
|
|
|
|
in oping.c:923 in has_utf8() the #if HAVE_NCURSESW_NCURSES_H is
|
|
wrong. in consequence of this hist_symbols_utf8 is not used and the
|
|
the graph type prettyping is not realy pretty. the name of the header
|
|
file is curses.h see also oping.c:85 or the third changelog entry from
|
|
1997/05/31
|
|
|
|
https://github.com/octo/liboping/issues/36
|
|
|
|
[Upstream: https://github.com/octo/liboping/pull/49/commits/a313923ec12d11daa8e70497c6b7b5d50965821b]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
src/oping.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/oping.c b/src/oping.c
|
|
index 87ca81a..62dbb67 100644
|
|
--- a/src/oping.c
|
|
+++ b/src/oping.c
|
|
@@ -903,7 +903,7 @@ static void time_calc (struct timespec *ts_dest, /* {{{ */
|
|
#if USE_NCURSES
|
|
static _Bool has_utf8() /* {{{ */
|
|
{
|
|
-# if HAVE_NCURSESW_NCURSES_H
|
|
+# if HAVE_NCURSESW_CURSES_H
|
|
if (!opt_utf8)
|
|
{
|
|
/* Automatically determine */
|
|
--
|
|
2.25.1
|
|
|