Don't use AM_CONDITIONAL for CURSES.

[meshlink] / src / top.c

diff --git a/src/top.c b/src/top.c
index dc1fecf30d9eb7521fbe9ff5398c6b7362443063..a457e0803c9b12c2cbb8c39a300aa70e2e30fc2c 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -19,6 +19,8 @@
 
 #include "system.h"
 
+#ifdef HAVE_CURSES
+
 #include <curses.h>
 
 #include "control_common.h"
@@ -61,6 +63,10 @@ static bool changed = true;
 static const char *unit = "bytes";
 static float scale = 1;
 
+#ifndef timersub
+#define timersub(a, b, c) do {(c)->tv_sec = (a)->tv_sec - (b)->tv_sec; (c)->tv_usec = (a)->tv_usec = (b)->tv_usec;} while(0)
+#endif
+
 static void update(int fd) {
        sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
        gettimeofday(&now, NULL);
@@ -108,7 +114,6 @@ static void update(int fd) {
                        } else {
                                found = xmalloc_and_zero(sizeof *found);
                                found->name = xstrdup(name);
-                               fprintf(stderr, "Inserting %s before %s\n", found->name, node->name);
                                list_insert_before(&node_list, i, found);
                                changed = true;
                                break;
@@ -137,7 +142,7 @@ static void update(int fd) {
 static void redraw(void) {
        erase();
 
-       mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname, node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
+       mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname ?: "", node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
        attrset(A_REVERSE);
        mvprintw(2, 0, "Node                IN pkts   IN %s   OUT pkts  OUT %s", unit, unit);
        chgat(-1, A_REVERSE, 0, NULL);
@@ -222,10 +227,10 @@ static void redraw(void) {
                        attrset(A_DIM);
 
                if(cumulative)
-                       mvprintw(row, 0, "%-16s %'10"PRIu64" %'10.0f %'10"PRIu64" %'10.0f",
+                       mvprintw(row, 0, "%-16s %10"PRIu64" %10.0f %10"PRIu64" %10.0f",
                                        node->name, node->in_packets, node->in_bytes * scale, node->out_packets, node->out_bytes * scale);
                else
-                       mvprintw(row, 0, "%-16s %'10.0f %'10.0f %'10.0f %'10.0f",
+                       mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f",
                                        node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
        }
 
@@ -307,3 +312,5 @@ void top(int fd) {
 
        endwin();
 }
+
+#endif