*
* Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc.
*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*
* David MacKenzie <djm@gnu.ai.mit.edu>
*
* Options for expand:
- * -t num --tabs=NUM Convert tabs to num spaces (default 8 spaces).
+ * -t num --tabs NUM Convert tabs to num spaces (default 8 spaces).
* -i --initial Only convert initial tabs on each line to spaces.
*
* Options for unexpand:
* -a --all Convert all blanks, instead of just initial blanks.
* -f --first-only Convert only leading sequences of blanks (default).
- * -t num --tabs=NUM Have tabs num characters apart instead of 8.
+ * -t num --tabs NUM Have tabs num characters apart instead of 8.
*
* Busybox version (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
*
* Caveat: this versions of expand and unexpand don't accept tab lists.
*/
+//config:config EXPAND
+//config: bool "expand (5.8 kb)"
+//config: default y
+//config: help
+//config: By default, convert all tabs to spaces.
+//config:
+//config:config UNEXPAND
+//config: bool "unexpand (6 kb)"
+//config: default y
+//config: help
+//config: By default, convert only leading sequences of blanks to tabs.
+
+//applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
+// APPLET_ODDNAME:name main location suid_type help
+//applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand))
+
+//kbuild:lib-$(CONFIG_EXPAND) += expand.o
+//kbuild:lib-$(CONFIG_UNEXPAND) += expand.o
+
+//usage:#define expand_trivial_usage
+//usage: "[-i] [-t N] [FILE]..."
+//usage:#define expand_full_usage "\n\n"
+//usage: "Convert tabs to spaces, writing to stdout\n"
+//usage: "\n -i Don't convert tabs after non blanks"
+//usage: "\n -t Tabstops every N chars"
+
+//usage:#define unexpand_trivial_usage
+//usage: "[-fa][-t N] [FILE]..."
+//usage:#define unexpand_full_usage "\n\n"
+//usage: "Convert spaces to tabs, writing to stdout\n"
+//usage: "\n -a Convert all blanks"
+//usage: "\n -f Convert only leading blanks"
+//usage: "\n -t N Tabstops every N chars"
+
#include "libbb.h"
#include "unicode.h"
if (c == '\t') {
unsigned len;
*ptr = '\0';
-# if ENABLE_FEATURE_ASSUME_UNICODE
- len = bb_mbstrlen(ptr_strbeg);
+# if ENABLE_UNICODE_SUPPORT
+ len = unicode_strwidth(ptr_strbeg);
# else
len = ptr - ptr_strbeg;
# endif
while (*ptr) {
unsigned n;
- unsigned len;
+ unsigned len = 0;
while (*ptr == ' ') {
- column++;
ptr++;
+ len++;
}
+ column += len;
if (*ptr == '\t') {
column += tab_size - (column % tab_size);
ptr++;
}
n = column / tab_size;
- column = column % tab_size;
- while (n--)
- putchar('\t');
+ if (n) {
+ len = column = column % tab_size;
+ while (n--)
+ putchar('\t');
+ }
if ((opt & OPT_INITIAL) && ptr != line) {
- printf("%*s%s", column, "", ptr);
+ printf("%*s%s", len, "", ptr);
break;
}
n = strcspn(ptr, "\t ");
- printf("%*s%.*s", column, "", n, ptr);
-# if ENABLE_FEATURE_ASSUME_UNICODE
+ printf("%*s%.*s", len, "", n, ptr);
+# if ENABLE_UNICODE_SUPPORT
{
- char c;
- c = ptr[n];
+ char c = ptr[n];
ptr[n] = '\0';
- len = bb_mbstrlen(ptr);
+ len = unicode_strwidth(ptr);
ptr[n] = c;
}
# else
unsigned opt;
int exit_status = EXIT_SUCCESS;
-#if ENABLE_FEATURE_EXPAND_LONG_OPTIONS
- static const char expand_longopts[] ALIGN1 =
- /* name, has_arg, val */
- "initial\0" No_argument "i"
- "tabs\0" Required_argument "t"
- ;
-#endif
-#if ENABLE_FEATURE_UNEXPAND_LONG_OPTIONS
- static const char unexpand_longopts[] ALIGN1 =
- /* name, has_arg, val */
- "first-only\0" No_argument "i"
- "tabs\0" Required_argument "t"
- "all\0" No_argument "a"
- ;
-#endif
init_unicode();
if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) {
- IF_FEATURE_EXPAND_LONG_OPTIONS(applet_long_options = expand_longopts);
- opt = getopt32(argv, "it:", &opt_t);
+ opt = getopt32long(argv, "it:",
+ "initial\0" No_argument "i"
+ "tabs\0" Required_argument "t"
+ , &opt_t
+ );
} else {
- IF_FEATURE_UNEXPAND_LONG_OPTIONS(applet_long_options = unexpand_longopts);
- /* -t NUM sets also -a */
- opt_complementary = "ta";
- opt = getopt32(argv, "ft:a", &opt_t);
+ opt = getopt32long(argv, "^"
+ "ft:a"
+ "\0"
+ "ta" /* -t NUM sets -a */,
+ "first-only\0" No_argument "i"
+ "tabs\0" Required_argument "t"
+ "all\0" No_argument "a"
+ , &opt_t
+ );
/* -f --first-only is the default */
if (!(opt & OPT_ALL)) opt |= OPT_INITIAL;
}