diff --git a/src/oping.c b/src/oping.c
index e3bbffc7e66559986d16c12c0df42411e3013023..bac45f05ad784fe67057e4aac4a2462d9def900b 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
/* http://newsgroups.derkeiler.com/Archive/Rec/rec.games.roguelike.development/2010-09/msg00050.html */
# define _X_OPEN_SOURCE_EXTENDED
-# if HAVE_NCURSESW_NCURSES_H
-# include <ncursesw/ncurses.h>
-# elif HAVE_NCURSES_H
+#if defined HAVE_NCURSESW_CURSES_H
+# include <ncursesw/curses.h>
+#elif defined HAVE_NCURSESW_H
+# include <ncursesw.h>
+#elif defined HAVE_NCURSES_CURSES_H
+# include <ncurses/curses.h>
+#elif defined HAVE_NCURSES_H
# include <ncurses.h>
-# endif
+#else
+# error "SysV or X/Open-compatible Curses header file required"
+#endif
# define OPING_GREEN 1
# define OPING_YELLOW 2
static int opt_utf8 = 0;
#endif
static char *opt_outfile = NULL;
+static int opt_bell = 0;
static int host_num = 0;
static FILE *outfile = NULL;
while (1)
{
- optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:"
+ optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:b"
#if USE_NCURSES
"uUg:"
#endif
free (opt_outfile);
opt_outfile = strdup (optarg);
}
+ break;
case 'P':
{
opt_utf8 = 1;
break;
#endif
+ case 'b':
+ opt_bell = 1;
+ break;
case 'Z':
{
#if USE_NCURSES
}
#endif
+ if (opt_bell) {
+#if USE_NCURSES
+ beep();
+#else
+ HOST_PRINTF ("\a");
+#endif
+ }
}
else /* if (!(latency > 0.0)) */
{
if ((sequence % 32) == 0)
fprintf (outfile, "#time,host,latency[ms]\n");
- fprintf (outfile, "%.3f \"%s\" %.2f\n", t, context->host, latency);
+ fprintf (outfile, "%.3f,\"%s\",%.2f\n", t, context->host, latency);
}
}