libbb: move isqrt from factor, use it in diff too

[oweals/busybox.git] / coreutils / expand.c

diff --git a/coreutils/expand.c b/coreutils/expand.c
index cfb1e25d9216eebbd72593d18433233aa53afe00..9ce86ebff891bbd259596b4e36147f2c4cbc341b 100644 (file)
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -3,23 +3,80 @@
  *
  * 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"
+//config:      default y
+//config:      help
+//config:        By default, convert all tabs to spaces.
+//config:
+//config:config FEATURE_EXPAND_LONG_OPTIONS
+//config:      bool "Enable long options"
+//config:      default y
+//config:      depends on EXPAND && LONG_OPTS
+//config:
+//config:config UNEXPAND
+//config:      bool "unexpand"
+//config:      default y
+//config:      help
+//config:        By default, convert only leading sequences of blanks to tabs.
+//config:
+//config:config FEATURE_UNEXPAND_LONG_OPTIONS
+//config:      bool "Enable long options"
+//config:      default y
+//config:      depends on UNEXPAND && LONG_OPTS
+
+//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:       IF_FEATURE_EXPAND_LONG_OPTIONS(
+//usage:     "\n       -i,--initial    Don't convert tabs after non blanks"
+//usage:     "\n       -t,--tabs N     Tabstops every N chars"
+//usage:       )
+//usage:       IF_NOT_FEATURE_EXPAND_LONG_OPTIONS(
+//usage:     "\n       -i      Don't convert tabs after non blanks"
+//usage:     "\n       -t      Tabstops every N chars"
+//usage:       )
+
+//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:       IF_FEATURE_UNEXPAND_LONG_OPTIONS(
+//usage:     "\n       -a,--all        Convert all blanks"
+//usage:     "\n       -f,--first-only Convert only leading blanks"
+//usage:     "\n       -t,--tabs N     Tabstops every N chars"
+//usage:       )
+//usage:       IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS(
+//usage:     "\n       -a      Convert all blanks"
+//usage:     "\n       -f      Convert only leading blanks"
+//usage:     "\n       -t N    Tabstops every N chars"
+//usage:       )
+
 #include "libbb.h"
 #include "unicode.h"
 
@@ -48,12 +105,8 @@ static void expand(FILE *file, unsigned tab_size, unsigned opt)
                        if (c == '\t') {
                                unsigned len;
                                *ptr = '\0';
-# if ENABLE_FEATURE_ASSUME_UNICODE
-                               {
-                                       uni_stat_t uni_stat;
-                                       printable_string(&uni_stat, ptr_strbeg);
-                                       len = uni_stat.unicode_width;
-                               }
+# if ENABLE_UNICODE_SUPPORT
+                               len = unicode_strwidth(ptr_strbeg);
 # else
                                len = ptr - ptr_strbeg;
 # endif
@@ -107,14 +160,11 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt)
                        }
                        n = strcspn(ptr, "\t ");
                        printf("%*s%.*s", len, "", n, ptr);
-# if ENABLE_FEATURE_ASSUME_UNICODE
+# if ENABLE_UNICODE_SUPPORT
                        {
-                               char c;
-                               uni_stat_t uni_stat;
-                               c = ptr[n];
+                               char c = ptr[n];
                                ptr[n] = '\0';
-                               printable_string(&uni_stat, ptr);
-                               len = uni_stat.unicode_width;
+                               len = unicode_strwidth(ptr);
                                ptr[n] = c;
                        }
 # else