From 9bed890aa889dad4c46b6d18fff8cbdac9feab1a Mon Sep 17 00:00:00 2001 From: C. McEnroe Date: Wed, 12 Feb 2020 21:31:09 -0500 Subject: Add sandman wrapper --- Makefile | 11 +++++++ README.7 | 15 ++++++++++ scripts/.gitignore | 1 + scripts/sandman.1 | 36 ++++++++++++++++++++++ scripts/sandman.m | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 151 insertions(+) create mode 100644 scripts/.gitignore create mode 100644 scripts/sandman.1 create mode 100644 scripts/sandman.m diff --git a/Makefile b/Makefile index 4d20e62..ceaaf38 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,17 @@ install: catgirl catgirl.1 uninstall: rm -f ${PREFIX}/bin/catgirl ${MANDIR}/man1/catgirl.1.gz +scripts/sandman: scripts/sandman.o + ${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@ + +install-sandman: scripts/sandman scripts/sandman.1 + install -d ${PREFIX}/bin ${MANDIR}/man1 + install scripts/sandman ${PREFIX}/bin + gzip -c scripts/sandman.1 > ${MANDIR}/man1/sandman.1.gz + +uninstall-sandman: + rm -f ${PREFIX}/bin/sandman ${MANDIR}/man1/sandman.1.gz + CHROOT_USER = chat CHROOT_GROUP = ${CHROOT_USER} diff --git a/README.7 b/README.7 index a942c40..9daf378 100644 --- a/README.7 +++ b/README.7 @@ -99,6 +99,19 @@ For example, PKG_CONFIG_PATH=/opt/libressl/lib/pkgconfig ./configure .Ed . +.Pp +The +.Nm sandman +wrapper is provided for macOS +to stop and start +.Nm +on system sleep and wake. +Install it as follows: +.Bd -literal -offset indent +make scripts/sandman +sudo make install-sandman +.Ed +. .Sh FILES .Bl -tag -width "complete.c" -compact .It Pa chat.h @@ -127,6 +140,8 @@ XDG base directories . .Pp .Bl -tag -width "scripts/notify-send.scpt" -compact +.It Pa scripts/sandman.m +sleep/wake wrapper for macOS .It Pa scripts/notify-send.scpt .Xr notify-send 1 in AppleScript diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 0000000..f6dc107 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1 @@ +sandman diff --git a/scripts/sandman.1 b/scripts/sandman.1 new file mode 100644 index 0000000..35765ec --- /dev/null +++ b/scripts/sandman.1 @@ -0,0 +1,36 @@ +.Dd February 12, 2020 +.Dt SANDMAN 1 +.Os +. +.Sh NAME +.Nm sandman +.Nd sleep wrapper +. +.Sh SYNOPSIS +.Nm +.Op Fl t Ar secs +.Ar command ... +. +.Sh DESCRIPTION +The +.Nm +utility wraps a +.Ar command , +sending it +.Dv SIGHUP +when the system goes to sleep, +and restarting it +when the system wakes. +. +.Pp +The arguments are as follows: +.Bl -tag -width Ds +.It Fl t Ar secs +Wait for +.Ar secs +before restarting the process. +The default is 8 seconds. +.El +. +.Sh AUTHORS +.An June Bug Aq Mt june@causal.agency diff --git a/scripts/sandman.m b/scripts/sandman.m new file mode 100644 index 0000000..838920d --- /dev/null +++ b/scripts/sandman.m @@ -0,0 +1,88 @@ +/* Copyright (C) 2019, 2020 C. McEnroe + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import +#import +#import +#import +#import +#import + +typedef unsigned uint; + +static pid_t pid; +static void spawn(char *argv[]) { + pid = fork(); + if (pid < 0) err(EX_OSERR, "fork"); + if (pid) return; + execvp(argv[0], argv); + err(EX_CONFIG, "%s", argv[0]); +} + +static void handler(int signal) { + (void)signal; + int status; + pid_t pid = wait(&status); + if (pid < 0) _exit(EX_OSERR); + _exit(status); +} + +int main(int argc, char *argv[]) { + uint delay = 8; + + int opt; + while (0 < (opt = getopt(argc, argv, "t:"))) { + switch (opt) { + break; case 't': delay = strtoul(optarg, NULL, 10); + break; default: return EX_USAGE; + } + } + argc -= optind; + argv += optind; + if (!argc) errx(EX_USAGE, "command required"); + + NSWorkspace *workspace = [NSWorkspace sharedWorkspace]; + NSNotificationCenter *notifCenter = [workspace notificationCenter]; + + [notifCenter addObserverForName:NSWorkspaceWillSleepNotification + object:nil + queue:nil + usingBlock:^(NSNotification *notif) { + (void)notif; + signal(SIGCHLD, SIG_IGN); + int error = kill(pid, SIGHUP); + if (error) err(EX_UNAVAILABLE, "kill"); + int status; + wait(&status); + }]; + + [notifCenter addObserverForName:NSWorkspaceDidWakeNotification + object:nil + queue:nil + usingBlock:^(NSNotification *notif) { + (void)notif; + warnx("waiting %u seconds...", delay); + sleep(delay); + signal(SIGCHLD, handler); + spawn(argv); + }]; + + signal(SIGCHLD, handler); + spawn(argv); + + [[NSApplication sharedApplication] run]; +} -- cgit 1.4.1-2-gfad0