Author: yuripv
Date: Sat Jun 13 08:37:24 2020
New Revision: 362146
URL: https://svnweb.freebsd.org/changeset/base/362146
Log:
locale: exit 1 if unknown keyword was specified
PR: 241906
Submitted by: Akos Somfai <akos.som...@gmail.com>
Modified:
head/usr.bin/locale/locale.c
head/usr.bin/locale/tests/locale_test.sh
Modified: head/usr.bin/locale/locale.c
==============================================================================
--- head/usr.bin/locale/locale.c Sat Jun 13 04:47:59 2020
(r362145)
+++ head/usr.bin/locale/locale.c Sat Jun 13 08:37:24 2020
(r362146)
@@ -61,7 +61,7 @@ void list_locales(void);
const char *lookup_localecat(int);
char *kwval_lconv(int);
int kwval_lookup(const char *, char **, int *, int *, int *);
-void showdetails(const char *);
+int showdetails(const char *);
void showkeywordslist(char *substring);
void showlocale(void);
void usage(void);
@@ -414,7 +414,8 @@ main(int argc, char *argv[])
setlocale(LC_ALL, "");
if (argc > 0) {
while (argc > 0) {
- showdetails(*argv);
+ if (showdetails(*argv) != 0)
+ exit(EXIT_FAILURE);
argv++;
argc--;
}
@@ -837,19 +838,16 @@ kwval_lookup(const char *kwname, char **kwval, int *ca
* Show details about requested keyword according to '-k' and/or '-c'
* command line options specified.
*/
-void
+int
showdetails(const char *kw)
{
int type, cat, tmpval, alloc;
char *kwval;
if (kwval_lookup(kw, &kwval, &cat, &type, &alloc) == 0) {
- /*
- * invalid keyword specified.
- * XXX: any actions?
- */
+ /* Invalid keyword specified */
fprintf(stderr, "Unknown keyword: `%s'\n", kw);
- return;
+ return (1);
}
if (prt_categories) {
@@ -889,6 +887,8 @@ showdetails(const char *kw)
if (alloc)
free(kwval);
+
+ return (0);
}
/*
Modified: head/usr.bin/locale/tests/locale_test.sh
==============================================================================
--- head/usr.bin/locale/tests/locale_test.sh Sat Jun 13 04:47:59 2020
(r362145)
+++ head/usr.bin/locale/tests/locale_test.sh Sat Jun 13 08:37:24 2020
(r362146)
@@ -160,8 +160,24 @@ no_flags_posix_body()
noexpr
}
+atf_test_case k_flag_unknown_kw
+k_flag_unknown_kw_head()
+{
+ atf_set "descr" \
+ "Verify 'locale -k' exit status is '1' for unknown keywords"
+}
+k_flag_unknown_kw_body()
+{
+ export LC_ALL="C"
+
+ # Hopefully the keyword will stay nonexistent
+ atf_check -s exit:1 -o empty -e ignore locale -k nonexistent
+}
+
+
atf_init_test_cases()
{
atf_add_test_case k_flag_posix
atf_add_test_case no_flags_posix
+ atf_add_test_case k_flag_unknown_kw
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
