summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2016-11-13 14:08:48 +0000
committerPádraig Brady <P@draigBrady.com>2016-11-14 00:34:39 +0000
commiteba871cd3237e8b7dcd9552f544b365934767849 (patch)
tree64ca47696b35783ff7749c7fa6a1d397aa51f730
parent40122a96dfa97c25c26abb3f47fa8d577cffa666 (diff)
downloadcoreutils-eba871cd3237e8b7dcd9552f544b365934767849.tar.xz
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.
-rw-r--r--AUTHORS18
-rw-r--r--cfg.mk2
-rw-r--r--src/cat.c2
-rw-r--r--src/cp.c2
-rw-r--r--src/df.c2
-rw-r--r--src/du.c2
-rw-r--r--src/getlimits.c2
-rw-r--r--src/local.mk10
-rw-r--r--src/realpath.c2
-rw-r--r--src/split.c2
-rw-r--r--src/stdbuf.c2
-rw-r--r--src/timeout.c2
-rw-r--r--src/truncate.c2
13 files changed, 20 insertions, 30 deletions
diff --git a/AUTHORS b/AUTHORS
index 572ad59a8..8606f1e29 100644
--- 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 a05fc0291..a1ac6ed09 100644
--- 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 411ffec0d..f337c34e6 100644
--- 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 97a868a53..926e05be3 100644
--- 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 470d5eee9..8f760db7d 100644
--- 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 ab6190966..cef8dacaf 100644
--- 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 e49a658c6..b2f5670d6 100644
--- 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 a8d7866a9..9e36ad9bd 100644
--- 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 fb9beb746..ce2f2b3b4 100644
--- 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 2b7a6264b..f9c99db43 100644
--- 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 74553c6f5..f583c6ab7 100644
--- 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 462ef6b81..10a3e092a 100644
--- 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 ccc0e9021..5f688ffd7 100644
--- 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;