svn commit: r242743 - head/usr.bin/locale

[Steve Wills]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I think this commit may have broken building the
print/system-config-printer port. It uses xmlto to generate it's
documentation, which calls "locale charmap". On at least 8.3 (only
place I've tested), this returns simply "US-ASCII", which works fine.
But now it returns the full list:

# locale charmap
LANG=
LC_CTYPE="C"
LC_COLLATE="C"
LC_TIME="C"
LC_NUMERIC="C"
LC_MONETARY="C"
LC_MESSAGES="C"
LC_ALL=
#

which is fine, but this gets put into an xml file and then fails to
parse. I guess we need to patch xmlto to call something else? Any
advice you can offer would be appreciated.

Thanks,
Steve

On 11/07/12 21:55, Greg Lehey wrote:
> Author: grog Date: Thu Nov  8 02:55:30 2012 New Revision: 242743 
> URL: http://svnweb.freebsd.org/changeset/base/242743
> 
> Log: Make parameters to -c and -k options optional.  If no
> parameters are supplied, print information for all keywords.
> 
> Improve output of -c option, in particular in conjunction with -k 
> option.
> 
> MFC after:	14 days
> 
> Modified: head/usr.bin/locale/locale.1 
> head/usr.bin/locale/locale.c
> 
> Modified: head/usr.bin/locale/locale.1 
> ==============================================================================
>
> 
- --- head/usr.bin/locale/locale.1	Thu Nov  8 02:29:16 2012	(r242742)
> +++ head/usr.bin/locale/locale.1	Thu Nov  8 02:55:30 2012
> (r242743) @@ -40,7 +40,7 @@ .Op Ar prefix .Nm .Op Fl ck -.Ar
> keyword ... +.Op Ar keyword ... .Sh DESCRIPTION The .Nm @@ -74,8
> +74,12 @@ directory. Print names of all available charmaps. .It Fl
> k Print the names and values of all selected keywords. +If no
> keywords are selected, print the names and values of all defined 
> +keywords. .It Fl c Print the category name for all selected
> keywords. +If no keywords are selected, print the category name for
> all defined +keywords. .El .Sh IMPLEMENTATION NOTES The special
> 
> Modified: head/usr.bin/locale/locale.c 
> ==============================================================================
>
> 
- --- head/usr.bin/locale/locale.c	Thu Nov  8 02:29:16 2012	(r242742)
> +++ head/usr.bin/locale/locale.c	Thu Nov  8 02:55:30 2012
> (r242743) @@ -253,12 +253,10 @@ main(int argc, char *argv[]) /*
> validate arguments */ if (all_locales && all_charmaps) usage(); -
> if ((all_locales || all_charmaps) && argc > 0) +	if ((all_locales
> || all_charmaps) && argc > 0) usage(); if ((all_locales ||
> all_charmaps) && (prt_categories || prt_keywords)) usage(); -	if
> ((prt_categories || prt_keywords) && argc <= 0) -		usage();
> 
> /* process '-a' */ if (all_locales) { @@ -282,13 +280,19 @@
> main(int argc, char *argv[]) }
> 
> /* process '-c' and/or '-k' */ -	if (prt_categories || prt_keywords
> || argc > 0) { -		setlocale(LC_ALL, ""); -		while (argc > 0) { -
> showdetails(*argv); -			argv++; -			argc--; -		} +	if
> (prt_categories || prt_keywords) { +		if (argc > 0) { +
> setlocale(LC_ALL, ""); +                        while (argc > 0) { 
> +				showdetails(*argv); +                                argv++; +
> argc--; +                        } +                } else { +
> uint i; +                        for (i = 0; i < sizeof (kwinfo) /
> sizeof (struct _kwinfo); i++) +				showdetails ((char *)kwinfo
> [i].name); +                } exit(0); }
> 
> @@ -303,7 +307,7 @@ usage(void) { printf("Usage: locale [ -a | -m
> ]\n" "       locale -k list [prefix]\n" -               "
> locale [ -ck ] keyword ...\n"); +               "       locale [
> -ck ] [keyword ...]\n"); exit(1); }
> 
> @@ -612,7 +616,10 @@ showdetails(char *kw) }
> 
> if (prt_categories) { -		printf("%s\n", lookup_localecat(cat)); +
> if (prt_keywords) +			printf("%-20s ", lookup_localecat(cat)); +
> else +	                printf("%-20s\t%s\n", kw,
> lookup_localecat(cat)); }
> 
> if (prt_keywords) { 
> _______________________________________________ 
> svn-src-head at freebsd.org mailing list 
> http://lists.freebsd.org/mailman/listinfo/svn-src-head To
> unsubscribe, send any mail to
> "svn-src-head-unsubscribe at freebsd.org"
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBAgAGBQJQp7hLAAoJEPXPYrMgexuhYyAIAI480Lksvd9w8zD4JkaOr9+g
01qann/a3pIyOofEThfrlK4aiNm6yAvsy+i58dAbuUFxEjr/QWr1gHuoyUQOAuXz
nh6VeGIQLOHbR7SyQPPkKI2+6o76QtLsruixAtNxcOM7AjqWaksqLS022MPG3Wmr
VxSEdva6YVTxcLQyq0C0XGWl5yLJGF/6MpkJP5CxZfLxqBQXUWg14Ei386PtmbOk
v1aEVo2l2mubOC2V5to0OwvuHg4TQNQX3EMcYkm5FHKE6qZG1Mork38Wu63J3eb6
I5mjTMIgLdXbLdxHamSsb7gt2+9SsZ6oLOJUsLstWi/ce6GCxmGKf76OSVcA4qk=
=9BY2
-----END PGP SIGNATURE-----