summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Kaivo <jkk@ung.org>2019-08-06 09:11:23 -0400
committerJakob Kaivo <jkk@ung.org>2019-08-06 09:11:23 -0400
commit1d00f6a1717826999472f9f7192e7372f34f5e99 (patch)
tree95c0f47f8501bf785313b4ce7bcd0691c6e9709c
parent52b4d08cf24c987c97a2210e69251f826f34c531 (diff)
bring in line with nice and envHEADmaster
-rw-r--r--nohup.c74
1 files changed, 46 insertions, 28 deletions
diff --git a/nohup.c b/nohup.c
index 7132340..e42a842 100644
--- a/nohup.c
+++ b/nohup.c
@@ -1,51 +1,74 @@
-#define _XOPEN_SOURCE 700
+/*
+ * UNG's Not GNU
+ *
+ * Copyright (c) 2011-2019, Jakob Kaivo <jkk@ung.org>
+ *
+ * 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.
+ */
+
+#define _XOPEN_SOURCE 500
#include <errno.h>
#include <fcntl.h>
#include <locale.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#define NOHUP_UTILITY_NOT_FOUND 127
-#define NOHUP_UTILITY_NOT_INVOKED 126
+#define UTILITY_NOT_INVOKED (126)
+#define UTILITY_NOT_FOUND (127)
int main(int argc, char *argv[])
{
- int c;
-
setlocale(LC_ALL, "");
- while ((c = getopt(argc, argv, "")) != -1) {
- switch (c) {
- default:
- return 1;
- }
+ while (getopt(argc, argv, "") != -1) {
+ return 1;
}
- argv += optind;
-
- if (argv[0] == NULL) {
- fprintf(stderr, "nohup: utility required\n");
- return NOHUP_UTILITY_NOT_INVOKED;
+ if (optind >= argc) {
+ fprintf(stderr, "nohup: missing operand\n");
+ return UTILITY_NOT_INVOKED;
}
signal(SIGHUP, SIG_IGN);
if (isatty(STDOUT_FILENO)) {
char out[FILENAME_MAX] = "nohup.out";
- int fd = open(out, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
+ int fd = open(out, O_WRONLY | O_CREAT | O_APPEND,
+ S_IRUSR | S_IWUSR);
+
if (fd == -1) {
char *home = getenv("HOME");
if (home == NULL) {
fprintf(stderr, "nohup: $HOME unset\n");
- return NOHUP_UTILITY_NOT_INVOKED;
+ return UTILITY_NOT_INVOKED;
}
+
snprintf(out, sizeof(out), "%s/nohup.out", home);
- fd = open(out, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
+ fd = open(out, O_WRONLY | O_CREAT | O_APPEND,
+ S_IRUSR | S_IWUSR);
+
if (fd == -1) {
- perror("nohup: couldn't open nohup.out or $HOME/nohup.out");
- return NOHUP_UTILITY_NOT_INVOKED;
+ perror("nohup: nohup.out or $HOME/nohup.out");
+ return UTILITY_NOT_INVOKED;
}
}
@@ -57,13 +80,8 @@ int main(int argc, char *argv[])
dup2(STDOUT_FILENO, STDERR_FILENO);
}
- execvp(argv[0], argv);
-
- perror("nohup");
-
- if (errno == ENOENT) {
- return NOHUP_UTILITY_NOT_FOUND;
- }
+ execvp(argv[optind], argv + optind);
- return NOHUP_UTILITY_NOT_INVOKED;
+ fprintf(stderr, "nohup: %s: %s\n", argv[optind], strerror(errno));
+ return errno == ENOENT ? UTILITY_NOT_FOUND : UTILITY_NOT_INVOKED;
}