sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit d2824f5294d38db891416f087b6b5410470e8d1e
parent 9ae6c45097e48de66219366f1c55bc4eb01adc7f
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 28 Jun 2019 00:18:48 -0700

Revert "Do not use arg.h for tools which take no flags"

This reverts commit 9016d288f1cd03bf514fe84d537b203040e1ccf8.

Tools that have no options are required by POSIX to support "--" so
that conforming applications have a way to shield their operands from
implementations that provide options as an extension.

echo(1) is just an exception, so it is handled specially.

See OPTIONS in https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/utilities/V3_chap01.html#tag_17_04

Diffstat:
Mchroot.c | 5++++-
Mcksum.c | 11++++++++++-
Mhostname.c | 5++++-
Mlink.c | 5++++-
Mnohup.c | 5++++-
Mprintenv.c | 11++++++++++-
Msetsid.c | 5++++-
Msleep.c | 5++++-
Msponge.c | 5++++-
Msync.c | 5++++-
Mtty.c | 5++++-
Munlink.c | 5++++-
Myes.c | 11++++++++++-
13 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/chroot.c b/chroot.c @@ -17,7 +17,10 @@ main(int argc, char *argv[]) char *shell[] = { "/bin/sh", "-i", NULL }, *aux, *cmd; int savederrno; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (!argc) usage(); diff --git a/cksum.c b/cksum.c @@ -92,12 +92,21 @@ cksum(int fd, const char *s) putchar('\n'); } +static void +usage(void) +{ + eprintf("usage: %s [file ...]\n", argv0); +} + int main(int argc, char *argv[]) { int fd; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (!argc) { cksum(0, NULL); diff --git a/hostname.c b/hostname.c @@ -16,7 +16,10 @@ main(int argc, char *argv[]) { char host[HOST_NAME_MAX + 1]; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (!argc) { if (gethostname(host, sizeof(host)) < 0) diff --git a/link.c b/link.c @@ -12,7 +12,10 @@ usage(void) int main(int argc, char *argv[]) { - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (argc != 2) usage(); diff --git a/nohup.c b/nohup.c @@ -19,7 +19,10 @@ main(int argc, char *argv[]) { int fd, savederrno; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (!argc) usage(); diff --git a/printenv.c b/printenv.c @@ -6,13 +6,22 @@ extern char **environ; +static void +usage(void) +{ + eprintf("usage: %s [var ...]\n", argv0); +} + int main(int argc, char *argv[]) { char *var; int ret = 0; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (!argc) { for (; *environ; environ++) diff --git a/setsid.c b/setsid.c @@ -15,7 +15,10 @@ main(int argc, char *argv[]) { int savederrno; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (!argc) usage(); diff --git a/sleep.c b/sleep.c @@ -14,7 +14,10 @@ main(int argc, char *argv[]) { unsigned seconds; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (argc != 1) usage(); diff --git a/sponge.c b/sponge.c @@ -17,7 +17,10 @@ main(int argc, char *argv[]) char tmp[] = "/tmp/sponge-XXXXXX"; int fd, tmpfd; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (argc != 1) usage(); diff --git a/sync.c b/sync.c @@ -12,7 +12,10 @@ usage(void) int main(int argc, char *argv[]) { - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (argc) usage(); diff --git a/tty.c b/tty.c @@ -15,7 +15,10 @@ main(int argc, char *argv[]) { char *tty; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (argc) usage(); diff --git a/unlink.c b/unlink.c @@ -12,7 +12,10 @@ usage(void) int main(int argc, char *argv[]) { - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND if (argc != 1) usage(); diff --git a/yes.c b/yes.c @@ -3,12 +3,21 @@ #include "util.h" +static void +usage(void) +{ + eprintf("usage: %s [string ...]\n", argv0); +} + int main(int argc, char *argv[]) { char **p; - argv0 = *argv, argv0 ? (argc--, argv++) : (void *)0; + ARGBEGIN { + default: + usage(); + } ARGEND for (p = argv; ; p = (*p && *(p + 1)) ? p + 1 : argv) { fputs(*p ? *p : "y", stdout);