diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 12:16:25 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-11 12:16:25 +0000 |
| commit | 1b5312d5c01fd5e12b938cfe65cda562e822619d (patch) | |
| tree | 60f086613e97aae5cb2635b8b9e3251c7b3c55cf /src/skaembutils/s6-chown.c | |
| parent | ac77200b30d6c8bbe9093655dd0f8d8bf6e88feb (diff) | |
| download | s6-portable-utils-1b5312d5c01fd5e12b938cfe65cda562e822619d.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/skaembutils/s6-chown.c')
| -rw-r--r-- | src/skaembutils/s6-chown.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/skaembutils/s6-chown.c b/src/skaembutils/s6-chown.c index 02b7ca7..a557642 100644 --- a/src/skaembutils/s6-chown.c +++ b/src/skaembutils/s6-chown.c @@ -1,11 +1,8 @@ /* ISC license. */ -#include <sys/types.h> #include <unistd.h> #include <skalibs/sgetopt.h> -#include <skalibs/uint64.h> -#include <skalibs/gidstuff.h> -#include <skalibs/uint.h> +#include <skalibs/types.h> #include <skalibs/strerr2.h> #include <skalibs/djbunix.h> @@ -20,15 +17,13 @@ int main (int argc, char const *const *argv, char const *const *envp) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "Uu:g:", &l) ; + int opt = subgetopt_r(argc, argv, "Uu:g:", &l) ; if (opt == -1) break ; switch (opt) { case 'u': { - uint64 u ; - if (!uint640_scan(l.arg, &u)) strerr_dieusage(100, USAGE) ; - uid = u ; + if (!uid0_scan(l.arg, &uid)) strerr_dieusage(100, USAGE) ; break ; } case 'g': @@ -38,11 +33,9 @@ int main (int argc, char const *const *argv, char const *const *envp) } case 'U': { - uint64 u ; char const *s = env_get2(envp, "UID") ; if (!s) strerr_dienotset(100, "UID") ; - if (!uint640_scan(s, &u)) strerr_dieinvalid(100, "UID") ; - uid = u ; + if (!uid0_scan(s, &uid)) strerr_dieinvalid(100, "UID") ; s = env_get2(envp, "GID") ; if (!s) strerr_dienotset(100, "GID") ; if (!gid0_scan(s, &gid)) strerr_dieinvalid(100, "GID") ; |