aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-26 15:46:01 +0000
committerRoland McGrath <roland@gnu.org>1996-06-26 15:46:01 +0000
commitbba7bb78f3bc3be2dacafc336d1342fcc5c57489 (patch)
tree6afde133640ee2d36b719114c6bf24cc1341e4f9 /locale
parentbe64fe6d86300687968ad072e8d7e15892386b5a (diff)
downloadglibc-bba7bb78f3bc3be2dacafc336d1342fcc5c57489.tar
glibc-bba7bb78f3bc3be2dacafc336d1342fcc5c57489.tar.gz
glibc-bba7bb78f3bc3be2dacafc336d1342fcc5c57489.tar.bz2
glibc-bba7bb78f3bc3be2dacafc336d1342fcc5c57489.zip
Wed Jun 26 01:58:49 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* nss/nss_files/files-parse.c (parse_list): Count null in EOL calc. Move DB code into separate -ldb library. * db/Makefile (extra-libs): New variable, list libdb. (routines): Renamed to libdb-routines. * shlib-versions: Add libdb=2. * nss/network-lookup.c (DEFAULT_CONFIG): New macro. * nss/host-lookup.c (DEFAULT_CONFIG): New macro. * nss/nsswitch.c (nss_parse_service_list): Use __strncasecmp instead of strncasecmp. Extend syntax to grok [!foo=bar]. * sysdeps/generic/strncase.c: Define __strncasecmp with strncasecmp as weak alias. * string/string.h: Declare __strncasecmp. * nss/nsswitch.c (nss_parse_file): Call __getline, not getline. (service_alias): Variable removed. (nss_parse_service_list): New function, broken out of nss_getline. Remove alias conversion; we will just use symlinks. (__nss_database_lookup): Take new string arg DEFCONFIG. If no entry exists, make one with service list parsed from that. * nss/nsswitch.h: Update protocol for __nss_database_lookup. * nss/XXX-lookup.c (DEFAULT_CONFIG): New macro, set to 0 if undefined. (DB_LOOKUP_FCT): Pass it to _nss_database_lookup. * grp/initgroups.c: Rewritten using getgrent. Handle unlimited group list size. * sunrpc/xdr.c (xdr_int): #if 0 out unresolved references in dead code. Wed Jun 26 01:56:50 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locale.c (long_options): Short form of --version option is `-V'. (main): Recognize `-V' as option, not `-v'. Call `usage' instead of printing error message for illegal option. (usage): Document `-V'.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/locale.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index ef5d9ae825..5196fa51fe 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -49,7 +49,7 @@ static const struct option long_options[] =
{ "charmaps", no_argument, NULL, 'm' },
{ "help", no_argument, NULL, 'h' },
{ "keyword-name", no_argument, &show_keyword_name, 1 },
- { "version", no_argument, NULL, 'v' },
+ { "version", no_argument, NULL, 'V' },
{ NULL, 0, NULL, 0 }
};
@@ -130,7 +130,7 @@ main (int argc, char *argv[])
int do_version = 0;
int do_charmaps = 0;
- /* Set initial values for global varaibles. */
+ /* Set initial values for global variables. */
show_category_name = 0;
show_keyword_name = 0;
@@ -142,7 +142,7 @@ main (int argc, char *argv[])
/* Initialize the message catalog. */
textdomain (PACKAGE);
- while ((optchar = getopt_long (argc, argv, "achkmv", long_options, NULL))
+ while ((optchar = getopt_long (argc, argv, "achkmV", long_options, NULL))
!= EOF)
switch (optchar)
{
@@ -163,12 +163,11 @@ main (int argc, char *argv[])
case 'm':
do_charmaps = 1;
break;
- case 'v':
+ case 'V':
do_version = 1;
break;
default:
- error (1, 0, gettext ("illegal option \"%s\""), optarg);
- break;
+ usage (EXIT_FAILURE);
}
/* Version information is requested. */
@@ -219,25 +218,24 @@ main (int argc, char *argv[])
/* Display usage information and exit. */
static void
-usage(int status)
+usage (int status)
{
if (status != EXIT_SUCCESS)
fprintf (stderr, gettext ("Try `%s --help' for more information.\n"),
program_invocation_name);
else
- printf(gettext ("\
+ printf (gettext ("\
Usage: %s [OPTION]... name\n\
Mandatory arguments to long options are mandatory for short options too.\n\
-h, --help display this help and exit\n\
- -v, --version output version information and exit\n\
+ -V, --version output version information and exit\n\
\n\
-a, --all-locales write names of available locales\n\
-m, --charmaps write names of available charmaps\n\
\n\
-c, --category-name write names of selected categories\n\
- -k, --keyword-name write names of selected keywords\n\
-\n\
-"), program_invocation_name);
+ -k, --keyword-name write names of selected keywords\n"),
+ program_invocation_name);
exit (status);
}