3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 09:39:25 +01:00

build: Adjust to the latest ELL signal API changes

This commit is contained in:
Marcel Holtmann 2018-11-01 22:09:19 +01:00
parent a9c2d71874
commit 72a64fa7fb
6 changed files with 14 additions and 17 deletions

View File

@ -24,10 +24,12 @@
#include <config.h> #include <config.h>
#endif #endif
#include <ell/ell.h> #include <stdio.h>
#include <signal.h>
#include <readline/history.h> #include <readline/history.h>
#include <readline/readline.h> #include <readline/readline.h>
#include <stdio.h> #include <ell/ell.h>
#include "agent.h" #include "agent.h"
#include "command.h" #include "command.h"
@ -577,29 +579,19 @@ void display_quit(void)
rl_crlf(); rl_crlf();
} }
static void signal_handler(struct l_signal *signal, uint32_t signo, static void signal_handler(void *user_data)
void *user_data)
{ {
switch (signo) { if (display_refresh.cmd)
case SIGWINCH: display_refresh_reset();
if (display_refresh.cmd)
display_refresh_reset();
break;
}
} }
void display_init(void) void display_init(void)
{ {
sigset_t mask;
display_refresh.redo_entries = l_queue_new(); display_refresh.redo_entries = l_queue_new();
setlinebuf(stdout); setlinebuf(stdout);
sigemptyset(&mask); resize_signal = l_signal_create(SIGWINCH, signal_handler, NULL, NULL);
sigaddset(&mask, SIGWINCH);
resize_signal = l_signal_create(&mask, signal_handler, NULL, NULL);
rl_attempted_completion_function = command_completion; rl_attempted_completion_function = command_completion;
rl_completion_display_matches_hook = display_completion_matches; rl_completion_display_matches_hook = display_completion_matches;

View File

@ -25,6 +25,7 @@
#endif #endif
#include <errno.h> #include <errno.h>
#include <signal.h>
#include <ell/ell.h> #include <ell/ell.h>
#include "command.h" #include "command.h"

View File

@ -25,10 +25,11 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <signal.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/genetlink.h> #include <linux/genetlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>

View File

@ -28,6 +28,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <signal.h>
#include <ell/ell.h> #include <ell/ell.h>
#include "linux/nl80211.h" #include "linux/nl80211.h"

View File

@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include <signal.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <net/if_arp.h> #include <net/if_arp.h>

View File

@ -24,6 +24,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <signal.h>
#include <ell/ell.h> #include <ell/ell.h>
#include "wired/dbus.h" #include "wired/dbus.h"