From: Florian Forster <ff@octo.it>
Date: Sun, 19 Mar 2017 09:47:41 +0000 (+0100)
Subject: Merge commit 'refs/pull/18/head' of github.com:octo/liboping
X-Git-Url: https://git.octo.it/?p=liboping.git;a=commitdiff_plain;h=5bacc4ccaee4b44b1f45b8e589797ba9a4001cba;hp=-c

Merge commit 'refs/pull/18/head' of github.com:octo/liboping

Fixes: #17
---

5bacc4ccaee4b44b1f45b8e589797ba9a4001cba
diff --combined src/oping.c
index 8c35f3b,f2e48a6..de44d08
--- a/src/oping.c
+++ b/src/oping.c
@@@ -1360,10 -1360,11 +1360,11 @@@ static int pre_loop_hook (pingobj_t *pi
  	if (has_colors () == TRUE)
  	{
  		start_color ();
- 		init_pair (OPING_GREEN,  COLOR_GREEN,  /* default = */ 0);
- 		init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ 0);
- 		init_pair (OPING_RED,    COLOR_RED,    /* default = */ 0);
- 		init_pair (OPING_GREEN_HIST,  COLOR_GREEN,  COLOR_BLACK);
+ 		use_default_colors ();
+ 		init_pair (OPING_GREEN,  COLOR_GREEN,  /* default = */ -1);
+ 		init_pair (OPING_YELLOW, COLOR_YELLOW, /* default = */ -1);
+ 		init_pair (OPING_RED,    COLOR_RED,    /* default = */ -1);
+ 		init_pair (OPING_GREEN_HIST,  COLOR_GREEN,  -1);
  		init_pair (OPING_YELLOW_HIST, COLOR_YELLOW, COLOR_GREEN);
  		init_pair (OPING_RED_HIST,    COLOR_RED,    COLOR_YELLOW);
  	}
@@@ -1614,10 -1615,11 +1615,10 @@@ static void update_host_hook (pingobj_i
  
  	if (outfile != NULL)
  	{
 -		struct timespec ts = { 0, 0 };
 -
 -		if (clock_gettime (CLOCK_REALTIME, &ts) == 0)
 +		struct timeval tv = {0};
 +		if (gettimeofday (&tv, NULL) == 0)
  		{
 -			double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0);
 +			double t = ((double) tv.tv_sec) + (((double) tv.tv_usec) / 1000000.0);
  
  			if ((sequence % 32) == 0)
  				fprintf (outfile, "#time,host,latency[ms]\n");