From 0c2e1cf507f1d386f31aa9dd56797c35c5e24aa1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 28 Dec 2015 15:28:29 +0100 Subject: satd: exec to an image without init text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/satd-diminished.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/satd.c | 7 +++---- 2 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 src/satd-diminished.c diff --git a/src/satd-diminished.c b/src/satd-diminished.c new file mode 100644 index 0000000..ed885c7 --- /dev/null +++ b/src/satd-diminished.c @@ -0,0 +1,50 @@ +/** + * Copyright © 2015 Mattias Andrée + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +#include + + + +/** + * The file descriptor for the socket. + */ +#define SOCK_FILENO 3 + + + +/** + * The sat daemon. + * + * @param argc Should be 3. + * @param argv The name of the process, the pathname of the socket, + * and $SAT_HOOK_PATH (the pathname of the hook-script.) + * @return 0 The process was successful. + * @return 1 The process failed queuing the job. + */ +int +main(int argc, char *argv[]) +{ + close(SOCK_FILENO); + unlink(argv[1]); + return 0; + (void) argc; +} + diff --git a/src/satd.c b/src/satd.c index 74b190f..a5b09ff 100644 --- a/src/satd.c +++ b/src/satd.c @@ -218,10 +218,9 @@ main(int argc, char *argv[]) /* Daemonise. */ t (foreground ? 0 : daemonise("satd", DAEMONISE_KEEP_FDS, sock, -1)); - close(sock); - unlink(address.sun_path); - undaemonise(); - return 0; + /* Change to a process image without all this initialisation text. */ + execl(LIBEXEC "/" PACKAGE "/satd-diminished", argv0, + address.sun_path, getenv("SAT_HOOK_PATH"), NULL); fail: if (errno) -- cgit v1.2.3-70-g09d2