From ec47b3167f480a0ef0292ed2af0a96a1e0548e71 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 23 Dec 2012 18:21:16 -0800 Subject: [PATCH] Make --no-archive default for localedef - kukuk@suse.de --- locale/programs/localedef.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 2a0f2aa..aeb437a 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -81,7 +81,7 @@ const char *alias_file; static struct localedef_t *locales; /* If true don't add locale data to archive. */ -bool no_archive; +bool no_archive = true; /* If true add named locales to archive. */ static bool add_to_archive; @@ -112,6 +112,7 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; #define OPT_REPLACE 307 #define OPT_DELETE_FROM_ARCHIVE 308 #define OPT_LIST_ARCHIVE 309 +#define OPT_ARCHIVE 310 #define OPT_LITTLE_ENDIAN 400 #define OPT_BIG_ENDIAN 401 @@ -136,6 +137,8 @@ static const struct argp_option options[] = N_("Suppress warnings and information messages") }, { "verbose", 'v', NULL, 0, N_("Print more messages") }, { NULL, 0, NULL, 0, N_("Archive control:") }, + { "archive", OPT_ARCHIVE, NULL, 0, + N_("Add new data to archive") }, { "no-archive", OPT_NO_ARCHIVE, NULL, 0, N_("Don't add new data to archive") }, { "add-to-archive", OPT_ADD_TO_ARCHIVE, NULL, 0, @@ -317,6 +320,9 @@ parse_opt (int key, char *arg, struct argp_state *state) case OPT_PREFIX: output_prefix = arg; break; + case OPT_ARCHIVE: + no_archive = false; + break; case OPT_NO_ARCHIVE: no_archive = true; break; -- 2.7.4