diff options
author | Pádraig Brady <P@draigBrady.com> | 2016-11-13 14:08:48 +0000 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2016-11-14 00:34:39 +0000 |
commit | eba871cd3237e8b7dcd9552f544b365934767849 (patch) | |
tree | 64ca47696b35783ff7749c7fa6a1d397aa51f730 /src | |
parent | 40122a96dfa97c25c26abb3f47fa8d577cffa666 (diff) | |
download | coreutils-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.
Diffstat (limited to 'src')
-rw-r--r-- | src/cat.c | 2 | ||||
-rw-r--r-- | src/cp.c | 2 | ||||
-rw-r--r-- | src/df.c | 2 | ||||
-rw-r--r-- | src/du.c | 2 | ||||
-rw-r--r-- | src/getlimits.c | 2 | ||||
-rw-r--r-- | src/local.mk | 10 | ||||
-rw-r--r-- | src/realpath.c | 2 | ||||
-rw-r--r-- | src/split.c | 2 | ||||
-rw-r--r-- | src/stdbuf.c | 2 | ||||
-rw-r--r-- | src/timeout.c | 2 | ||||
-rw-r--r-- | src/truncate.c | 2 |
11 files changed, 10 insertions, 20 deletions
@@ -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 "-". */ @@ -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") @@ -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") @@ -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; |