diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 13:36:02 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-03-12 13:36:02 +0000 |
| commit | 22d1a9da68a8ccd5c5835ec7b8268b5c31b07a44 (patch) | |
| tree | 99fecd5c9329183584c92ab25ecec3a0d030ade5 | |
| parent | 1b5312d5c01fd5e12b938cfe65cda562e822619d (diff) | |
| download | s6-portable-utils-22d1a9da68a8ccd5c5835ec7b8268b5c31b07a44.tar.gz s6-portable-utils-22d1a9da68a8ccd5c5835ec7b8268b5c31b07a44.tar.xz s6-portable-utils-22d1a9da68a8ccd5c5835ec7b8268b5c31b07a44.zip | |
Fix a few omissions 2.2.0.0
| -rw-r--r-- | src/skaembutils/s6-ls.c | 4 | ||||
| -rw-r--r-- | src/skaembutils/s6-test.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/skaembutils/s6-ls.c b/src/skaembutils/s6-ls.c index 369cede..fa5ed82 100644 --- a/src/skaembutils/s6-ls.c +++ b/src/skaembutils/s6-ls.c @@ -1,7 +1,7 @@ /* ISC license. */ +#include <string.h> #include <skalibs/sgetopt.h> -#include <skalibs/bytestr.h> #include <skalibs/direntry.h> #include <skalibs/buffer.h> #include <skalibs/strerr2.h> @@ -43,7 +43,7 @@ int main (int argc, char const *const *argv) { if (!all || !d->d_name[1] || ((d->d_name[1] == '.') && !d->d_name[2])) continue ; } - if (exclude && !str_diff(exclude, d->d_name)) continue ; + if (exclude && !strcmp(exclude, d->d_name)) continue ; if ((buffer_puts(buffer_1, d->d_name) < 0) || (buffer_put(buffer_1, &delim, 1) < 0)) strerr_diefu1sys(111, "write to stdout") ; diff --git a/src/skaembutils/s6-test.c b/src/skaembutils/s6-test.c index d2d3b76..474eded 100644 --- a/src/skaembutils/s6-test.c +++ b/src/skaembutils/s6-test.c @@ -424,7 +424,7 @@ static int run (struct node const *tree, unsigned int root) unsigned int fd ; if (!uint0_scan(tree[tree[root].arg1].data, &fd)) strerr_dief2x(100, tree[root].data, " requires an integer argument") ; - return isatty((int)fd) ; + return isatty(fd) ; } case T_NONZERO : return tree[tree[root].arg1].data[0] ; |