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-quote.c | |
| parent | ac77200b30d6c8bbe9093655dd0f8d8bf6e88feb (diff) | |
| download | s6-portable-utils-1b5312d5c01fd5e12b938cfe65cda562e822619d.tar.xz | |
Adapt to skalibs-2.5.0.0
Diffstat (limited to 'src/skaembutils/s6-quote.c')
| -rw-r--r-- | src/skaembutils/s6-quote.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/skaembutils/s6-quote.c b/src/skaembutils/s6-quote.c index 6925806..24662e8 100644 --- a/src/skaembutils/s6-quote.c +++ b/src/skaembutils/s6-quote.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <sys/types.h> +#include <string.h> #include <skalibs/sgetopt.h> #include <skalibs/strerr2.h> #include <skalibs/allreadwrite.h> @@ -21,7 +21,7 @@ int main (int argc, char const *const *argv) subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - register int opt = subgetopt_r(argc, argv, "nud:", &l) ; + int opt = subgetopt_r(argc, argv, "nud:", &l) ; if (opt == -1) break ; switch (opt) { @@ -34,14 +34,14 @@ int main (int argc, char const *const *argv) argc -= l.ind ; argv += l.ind ; } if (!argc) strerr_dieusage(100, USAGE) ; - delimlen = str_len(delim) ; + delimlen = strlen(delim) ; if (startquote) { if (!delimlen) strerr_dief1x(100, "no character to quote with!") ; if (!stralloc_catb(&sa, delim, 1)) strerr_diefu1sys(111, "stralloc_catb") ; } - if (!string_quote_nodelim_mustquote(&sa, *argv, str_len(*argv), delim, delimlen)) + if (!string_quote_nodelim_mustquote(&sa, *argv, strlen(*argv), delim, delimlen)) strerr_diefu1sys(111, "quote") ; if (startquote) { |