aboutsummaryrefslogtreecommitdiff
path: root/toys/pending
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2017-12-29 17:19:02 -0600
committerRob Landley <rob@landley.net>2017-12-29 17:19:02 -0600
commit736afbadbffcb66fc8b589b35526e7eac5048b68 (patch)
tree875e26a110a1c617dd0d7a6bd6ff077e75278481 /toys/pending
parent78c3fcd224c83b454e80a2160ec62e8daf3be5ab (diff)
downloadtoybox-736afbadbffcb66fc8b589b35526e7eac5048b68.tar.gz
Promote iconv.
Diffstat (limited to 'toys/pending')
-rw-r--r--toys/pending/iconv.c72
1 files changed, 0 insertions, 72 deletions
diff --git a/toys/pending/iconv.c b/toys/pending/iconv.c
deleted file mode 100644
index 9b3c76b3..00000000
--- a/toys/pending/iconv.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* iconv.c - Convert character encoding
- *
- * Copyright 2014 Felix Janda <felix.janda@posteo.de>
- *
- * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/iconv.html
-
-USE_ICONV(NEWTOY(iconv, "cst:f:", TOYFLAG_USR|TOYFLAG_BIN))
-
-config ICONV
- bool "iconv"
- default n
- depends on TOYBOX_ICONV
- help
- usage: iconv [-f FROM] [-t TO] [FILE...]
-
- Convert character encoding of files.
-
- -c Omit invalid chars
- -f convert from (default utf8)
- -t convert to (default utf8)
-*/
-
-#define FOR_iconv
-#include "toys.h"
-#include <iconv.h>
-
-GLOBALS(
- char *from;
- char *to;
-
- void *ic;
-)
-
-static void do_iconv(int fd, char *name)
-{
- char *outstart = toybuf+2048;
- size_t outlen, inlen = 0;
- int readlen = 1;
-
- for (;;) {
- char *in = toybuf, *out = outstart;
-
- if (readlen && 0>(readlen = read(fd, in+inlen, 2048-inlen))) {
- perror_msg("read '%s'", name);
- return;
- }
- inlen += readlen;
- if (!inlen) break;
-
- outlen = 2048;
- iconv(TT.ic, &in, &inlen, &out, &outlen);
- if (in == toybuf) {
- // Skip first byte of illegal sequence to avoid endless loops
- if (toys.optflags & FLAG_c) in++;
- else *(out++) = *(in++);
- inlen--;
- }
- if (out != outstart) xwrite(1, outstart, out-outstart);
- memmove(toybuf, in, inlen);
- }
-}
-
-void iconv_main(void)
-{
- if (!TT.to) TT.to = "utf8";
- if (!TT.from) TT.from = "utf8";
-
- if ((iconv_t)-1 == (TT.ic = iconv_open(TT.to, TT.from)))
- perror_exit("%s/%s", TT.to, TT.from);
- loopfiles(toys.optargs, do_iconv);
- if (CFG_TOYBOX_FREE) iconv_close(TT.ic);
-}