diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-12-25 02:45:41 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-12-25 02:45:41 +0000 |
| commit | 68990372b2a0eb3cdf998933dc0d01b76a0ebe85 (patch) | |
| tree | 55629e430a3c6e15e7c8ad67ef27612a1f84d4a0 | |
| parent | 74f8514a347f465bd169a20514cf70f8f9cfc721 (diff) | |
| download | s6-portable-utils-68990372b2a0eb3cdf998933dc0d01b76a0ebe85.tar.xz | |
Remove env_get
| -rw-r--r-- | src/skaembutils/s6-chown.c | 7 | ||||
| -rw-r--r-- | src/skaembutils/s6-test.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/skaembutils/s6-chown.c b/src/skaembutils/s6-chown.c index a557642..25db44f 100644 --- a/src/skaembutils/s6-chown.c +++ b/src/skaembutils/s6-chown.c @@ -1,6 +1,7 @@ /* ISC license. */ #include <unistd.h> +#include <stdlib.h> #include <skalibs/sgetopt.h> #include <skalibs/types.h> #include <skalibs/strerr2.h> @@ -8,7 +9,7 @@ #define USAGE "s6-chown [ -U ] [ -u uid ] [ -g gid ] file" -int main (int argc, char const *const *argv, char const *const *envp) +int main (int argc, char const *const *argv) { uid_t uid = -1 ; gid_t gid = -1 ; @@ -33,10 +34,10 @@ int main (int argc, char const *const *argv, char const *const *envp) } case 'U': { - char const *s = env_get2(envp, "UID") ; + char const *s = getenv("UID") ; if (!s) strerr_dienotset(100, "UID") ; if (!uid0_scan(s, &uid)) strerr_dieinvalid(100, "UID") ; - s = env_get2(envp, "GID") ; + s = getenv("GID") ; if (!s) strerr_dienotset(100, "GID") ; if (!gid0_scan(s, &gid)) strerr_dieinvalid(100, "GID") ; break ; diff --git a/src/skaembutils/s6-test.c b/src/skaembutils/s6-test.c index 474eded..be8201b 100644 --- a/src/skaembutils/s6-test.c +++ b/src/skaembutils/s6-test.c @@ -3,9 +3,9 @@ #include <sys/stat.h> #include <unistd.h> #include <string.h> +#include <stdlib.h> #include <skalibs/types.h> #include <skalibs/strerr2.h> -#include <skalibs/env.h> #include <skalibs/djbunix.h> #define USAGE "s6-test expression... or [ expression... ]" @@ -491,7 +491,7 @@ static int run (struct node const *tree, unsigned int root) return n1 <= n2 ; } case T_ENV : - return !!env_get(tree[tree[root].arg1].data) ; + return !!getenv(tree[tree[root].arg1].data) ; default: strerr_dief1x(111, "operation not implemented") ; } |