Michael Crosby 131514dad6 Update init to fe069a03affd2547fdb05e5b8b07202d2e4 ... diff: ```patch diff --git a/Makefile b/Makefile index 0b2b063..70df01b 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +GIT_VERSION := $(shell git describe --abbrev=40 --long --dirty --always --tags) all: - gcc -O2 -o init -static grimes.c + gcc -O2 -DVERSION=\"$(GIT_VERSION)\" -o init -static grimes.c diff --git a/grimes.c b/grimes.c index d0f836b..ffeea98 100644 --- a/grimes.c +++ b/grimes.c @@ -29,7 +29,7 @@ typedef struct reaper_t { } reaper_t; // reaper_new initializes the reaper with the provided process. -// it also sets up the signal handlers and child handlers for restore +// it also sets up the signal handlers and child handlers for restore // when the child is execed int reaper_new(reaper_t * reaper, process_t * process) { @@ -57,7 +57,7 @@ int reaper_new(reaper_t * reaper, process_t * process) return 0; } -// reaper_exit closes the reaper's signalfd and exits with the +// reaper_exit closes the reaper's signalfd and exits with the // child's exit status void reaper_exit(reaper_t * reaper, int status) { @@ -68,11 +68,11 @@ void reaper_exit(reaper_t * reaper, int status) exit(WEXITSTATUS(status)); } -// reaper_reap reaps any dead processes. If the process that is reaped +// reaper_reap reaps any dead processes. If the process that is reaped // is the child process that we spawned get its exit status and exit this program int reaper_reap(reaper_t * reaper) { - int status, child_exited, child_status = 0; + int status = 0, child_exited = 0, child_status = 0; for (;;) { pid_t pid = waitpid(-1, &status, WNOHANG); switch (pid) { @@ -140,6 +140,12 @@ int main(int argc, char **argv) { process_t process; reaper_t reaper; + + if (argc == 2 && !strcmp(argv[1], "--version")) { + printf("grimes version %s\n", VERSION); + exit(0); + } + if (reaper_new(&reaper, &process) != 0) { bail("initialize reaper %s", strerror(errno)); } ``` Signed-off-by: Michael Crosby <crosbymichael@gmail.com>		2016-11-02 09:27:54 -07:00
..
install-binaries.sh	Update init to fe069a03affd2547fdb05e5b8b07202d2e4	2016-11-02 09:27:54 -07:00