all: reduce usage of proper_name_utf8()

This reduces a standard coreutils install size by about 160K.

* src/cat.c: Change to proper_name() which removes about 18K text.
* src/cp.c: Likewise.
* src/df.c: Likewise.
* src/du.c: Likewise.
* src/getlimits.c: Likewise.
* src/realpath.c: Likewise.
* src/split.c: Likewise.
* src/stdbuf.c: Likewise.
* src/timeout.c: Likewise.
* src/truncate.c: Likewise.
* src/local.mk: Remove -llibiconv from the above programs.
* cfg.mk (sc_check-AUTHORS): Adjust to use factor(1).
* AUTHORS: Adjust to use ASCII to satisfy sc_check-AUTHORS.

diff --git a/AUTHORS b/AUTHORS
index 572ad59a80a6fc089954dbc187aa67ec65afdd22..8606f1e2947b61d1748efb446bcca2d55e0e35da 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ arch: David MacKenzie, Karel Zak
 base32: Simon Josefsson
 base64: Simon Josefsson
 basename: David MacKenzie
-cat: Torbjörn Granlund, Richard M. Stallman
+cat: Torbjorn Granlund, Richard M. Stallman
 chcon: Russell Coker, Jim Meyering
 chgrp: David MacKenzie, Jim Meyering
 chmod: David MacKenzie, Jim Meyering
@@ -14,16 +14,16 @@ chroot: Roland McGrath
 cksum: Q. Frank Xia
 comm: Richard M. Stallman, David MacKenzie
 coreutils: Alex Deymo
-cp: Torbjörn Granlund, David MacKenzie, Jim Meyering
+cp: Torbjorn Granlund, David MacKenzie, Jim Meyering
 csplit: Stuart Kemp, David MacKenzie
 cut: David M. Ihnat, David MacKenzie, Jim Meyering
 date: David MacKenzie
 dd: Paul Rubin, David MacKenzie, Stuart Kemp
-df: Torbjörn Granlund, David MacKenzie, Paul Eggert
+df: Torbjorn Granlund, David MacKenzie, Paul Eggert
 dir: Richard M. Stallman, David MacKenzie
 dircolors: H. Peter Anvin
 dirname: David MacKenzie, Jim Meyering
-du: Torbjörn Granlund, David MacKenzie, Paul Eggert, Jim Meyering
+du: Torbjorn Granlund, David MacKenzie, Paul Eggert, Jim Meyering
 echo: Brian Fox, Chet Ramey
 env: Richard Mlynarik, David MacKenzie
 expand: David MacKenzie
@@ -65,7 +65,7 @@ printf: David MacKenzie
 ptx: François Pinard
 pwd: Jim Meyering
 readlink: Dmitry V. Levin
-realpath: Pádraig Brady
+realpath: Padraig Brady
 rm: Paul Rubin, David MacKenzie, Richard M. Stallman, Jim Meyering
 rmdir: David MacKenzie
 runcon: Russell Coker
@@ -79,9 +79,9 @@ shred: Colin Plumb
 shuf: Paul Eggert
 sleep: Jim Meyering, Paul Eggert
 sort: Mike Haertel, Paul Eggert
-split: Torbjörn Granlund, Richard M. Stallman
+split: Torbjorn Granlund, Richard M. Stallman
 stat: Michael Meskes
-stdbuf: Pádraig Brady
+stdbuf: Padraig Brady
 stty: David MacKenzie
 sum: Kayvan Aghaiepour, David MacKenzie
 sync: Jim Meyering, Giuseppe Scrivano
@@ -89,11 +89,11 @@ tac: Jay Lepreau, David MacKenzie
 tail: Paul Rubin, David MacKenzie, Ian Lance Taylor, Jim Meyering
 tee: Mike Parker, Richard M. Stallman, David MacKenzie
 test: Kevin Braunsdorf, Matthew Bradburn
-timeout: Pádraig Brady
+timeout: Padraig Brady
 touch: Paul Rubin, Arnold Robbins, Jim Kingdon, David MacKenzie, Randy Smith
 tr: Jim Meyering
 true: Jim Meyering
-truncate: Pádraig Brady
+truncate: Padraig Brady
 tsort: Mark Kettenis
 tty: David MacKenzie
 uname: David MacKenzie

diff --git a/cfg.mk b/cfg.mk
index a05fc02917f9c7cec46e200b39ffe0b333dded64..a1ac6ed0998e28f7fa4eba081e0fcd7b23adfb50 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -261,7 +261,7 @@ au_dotdot = authors-dotdot
 au_actual = authors-actual
 sc_check-AUTHORS: $(all_programs)
        @locale=en_US.UTF-8;                            \
-       LC_ALL=$$locale ./src/cat --version             \
+       LC_ALL=$$locale ./src/factor --version          \
            | grep ' Torbjorn ' > /dev/null             \
          && { echo "$@: skipping this check"; exit 0; }; \
        rm -f $(au_actual) $(au_dotdot);                \

diff --git a/src/cat.c b/src/cat.c
index 411ffec0dac6753ce289a27e3c3e233e39502d8b..f337c34e697540011dc796f8731612be2294292d 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -45,7 +45,7 @@
 #define PROGRAM_NAME "cat"
 
 #define AUTHORS \
-  proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
+  proper_name ("Torbjorn Granlund"), \
   proper_name ("Richard M. Stallman")
 
 /* Name of input file.  May be "-".  */

diff --git a/src/cp.c b/src/cp.c
index 97a868a53c54aca5e954c388a7e4e32d7b63e9b0..926e05be34f79da6659743aeaa87e27148b9c7f4 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -54,7 +54,7 @@
 #define PROGRAM_NAME "cp"
 
 #define AUTHORS \
-  proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
+  proper_name ("Torbjorn Granlund"), \
   proper_name ("David MacKenzie"), \
   proper_name ("Jim Meyering")
 

diff --git a/src/df.c b/src/df.c
index 470d5eee912762b69331a9ec6f09fd47dea1e98d..8f760db7df0a93daa7109ce3986df9bed732c080 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -41,7 +41,7 @@
 #define PROGRAM_NAME "df"
 
 #define AUTHORS \
-  proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
+  proper_name ("Torbjorn Granlund"), \
   proper_name ("David MacKenzie"), \
   proper_name ("Paul Eggert")
 

diff --git a/src/du.c b/src/du.c
index ab6190966523dcde419bf7f21fb888c50ecfdb84..cef8dacaf0ddac28f5d2fd45b2830596dbf81e5d 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -50,7 +50,7 @@ extern bool fts_debug;
 #define PROGRAM_NAME "du"
 
 #define AUTHORS \
-  proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
+  proper_name ("Torbjorn Granlund"), \
   proper_name ("David MacKenzie"), \
   proper_name ("Paul Eggert"), \
   proper_name ("Jim Meyering")

diff --git a/src/getlimits.c b/src/getlimits.c
index e49a658c68c98c14a3f8a57edf4f7bd9ac234c19..b2f5670d67d30773a96357a4d9e2a752e668e4b8 100644 (file)
--- a/src/getlimits.c
+++ b/src/getlimits.c
@@ -27,7 +27,7 @@
 
 #define PROGRAM_NAME "getlimits"
 
-#define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
+#define AUTHORS proper_name ("Padraig Brady")
 
 #ifndef TIME_T_MAX
 # define TIME_T_MAX TYPE_MAXIMUM (time_t)

diff --git a/src/local.mk b/src/local.mk
index a8d7866a9ec79c81c23558de00036cbbc08c45b4..9e36ad9bd9f1bc545d7a0f647eb766b13264a636 100644 (file)
--- a/src/local.mk
+++ b/src/local.mk
@@ -288,19 +288,9 @@ src_ls_LDADD += $(LIB_HAS_ACL)
 copy_ldadd += $(LIB_XATTR)
 
 # for print_unicode_char, proper_name_utf8
-src_cat_LDADD += $(LIBICONV)
-src_cp_LDADD += $(LIBICONV)
-src_df_LDADD += $(LIBICONV)
-src_du_LDADD += $(LIBICONV)
 src_factor_LDADD += $(LIBICONV)
-src_getlimits_LDADD += $(LIBICONV)
 src_printf_LDADD += $(LIBICONV)
 src_ptx_LDADD += $(LIBICONV)
-src_realpath_LDADD += $(LIBICONV)
-src_split_LDADD += $(LIBICONV)
-src_stdbuf_LDADD += $(LIBICONV)
-src_timeout_LDADD += $(LIBICONV)
-src_truncate_LDADD += $(LIBICONV)
 
 # for libcrypto hash routines
 src_md5sum_LDADD += $(LIB_CRYPTO)

diff --git a/src/realpath.c b/src/realpath.c
index fb9beb746495ae39ca8fb5bf8da7808ad7c5d406..ce2f2b3b470f3c2d47c84fe270486bb05997b3c0 100644 (file)
--- a/src/realpath.c
+++ b/src/realpath.c
@@ -30,7 +30,7 @@
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "realpath"
 
-#define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
+#define AUTHORS proper_name ("Padraig Brady")
 
 enum
 {

diff --git a/src/split.c b/src/split.c
index 2b7a6264b3671bc0d65692fbbea810f9bb8949d3..f9c99db43f9bcdc3ef38b7c80008635b5b7eadf1 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -46,7 +46,7 @@
 #define PROGRAM_NAME "split"
 
 #define AUTHORS \
-  proper_name_utf8 ("Torbjorn Granlund", "Torbj\303\266rn Granlund"), \
+  proper_name ("Torbjorn Granlund"), \
   proper_name ("Richard M. Stallman")
 
 /* Shell command to filter through, instead of creating files.  */

diff --git a/src/stdbuf.c b/src/stdbuf.c
index 74553c6f5007a0aaf72fe2652a345175cb4f0767..f583c6ab7ebc129fb1861bf9ab0f09de8ef82929 100644 (file)
--- a/src/stdbuf.c
+++ b/src/stdbuf.c
@@ -35,7 +35,7 @@
 #define PROGRAM_NAME "stdbuf"
 #define LIB_NAME "libstdbuf.so" /* FIXME: don't hardcode  */
 
-#define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
+#define AUTHORS proper_name ("Padraig Brady")
 
 static char *program_path;
 

diff --git a/src/timeout.c b/src/timeout.c
index 462ef6b81e96e5cfb2f2beae2824de2eaf8cf5bf..10a3e092ad078c46315767dc254f3f759a7fdde1 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -75,7 +75,7 @@
 
 #define PROGRAM_NAME "timeout"
 
-#define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
+#define AUTHORS proper_name ("Padraig Brady")
 
 static int timed_out;
 static int term_signal = SIGTERM;  /* same default as kill command.  */

diff --git a/src/truncate.c b/src/truncate.c
index ccc0e9021b7181cc03449e955c7306601f2b3ac0..5f688ffd71db0e76d78a579cd77bcd3c737cd57e 100644 (file)
--- a/src/truncate.c
+++ b/src/truncate.c
@@ -35,7 +35,7 @@
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "truncate"
 
-#define AUTHORS proper_name_utf8 ("Padraig Brady", "P\303\241draig Brady")
+#define AUTHORS proper_name ("Padraig Brady")
 
 /* (-c) If true, don't create if not already there */
 static bool no_create;