From 43c4ef830b2cdcb8e973a56b552af18f9ac51c76 Mon Sep 17 00:00:00 2001 From: toni Date: Sat, 23 Jul 2016 19:20:02 +0200 Subject: upd --- irssi-tor.sh | 8 ++------ xidle.c | 7 +++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/irssi-tor.sh b/irssi-tor.sh index b9d2a5b..4116bfb 100755 --- a/irssi-tor.sh +++ b/irssi-tor.sh @@ -17,14 +17,10 @@ IRC_PORT="$2" IRC_NICK="$3" sudo iptables -A INPUT -p tcp '!' -s 127.0.0.1 --dport ${SOC_PORT} -j REJECT -socat -d -d -lmlocal2 TCP4-LISTEN:${SOC_PORT},reuseaddr,fork,range=127.0.0.1/32 SOCKS4A:localhost:${IRC_HOST}:${IRC_PORT},socksport=9050 & +socat TCP4-LISTEN:${SOC_PORT},fork SOCKS4A:localhost:${IRC_HOST}:${IRC_PORT},socksport=9050 & SOC_PID=$! echo "socat pid ${SOC_PID}" -if [ $# -eq 0 ]; then - irssi --noconnect -else - irssi -c localhost -p ${SOC_PORT} -n ${IRC_NICK} -fi +irssi --noconnect echo "kill ${SOC_PID}" kill -SIGTERM ${SOC_PID} 2>/dev/null wait ${SOC_PID} diff --git a/xidle.c b/xidle.c index b6f7188..c2794fc 100644 --- a/xidle.c +++ b/xidle.c @@ -1,4 +1,5 @@ #include +#include #include #include @@ -19,9 +20,11 @@ int main(int argc, char *argv[]) } display = XOpenDisplay(""); + if (!display) + return -1; - if (XScreenSaverQueryExtension(display, &event_base, &error_base)) { - if (XScreenSaverQueryInfo(display, DefaultRootWindow(display), &info) != True) { + if (XScreenSaverQueryExtension(display, &event_base, &error_base) == true) { + if (XScreenSaverQueryInfo(display, DefaultRootWindow(display), &info) != true) { fprintf(stderr, "Error: XScreenSaver QueryInfo failed\n"); return -1; } -- cgit v1.2.3