summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-09-13 03:21:39 +0000
committerUlrich Drepper <drepper@redhat.com>1996-09-13 03:21:39 +0000
commitfafaa44ef0176da243b19e4d68bf2ffc3bbb4f88 (patch)
tree33499236a84d75a7c87657aaa18602c9db05d697 /locale
parentae2ddc98c17c17897398c8d960d984789ecab0d9 (diff)
downloadglibc-fafaa44ef0176da243b19e4d68bf2ffc3bbb4f88.tar.gz
glibc-fafaa44ef0176da243b19e4d68bf2ffc3bbb4f88.tar.xz
glibc-fafaa44ef0176da243b19e4d68bf2ffc3bbb4f88.zip
update from main archive 960912
Fri Sep 13 04:33:08 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sched.h: New file.  helper to access posix/sched.h.
	* posix/sched.h: Change `sched_params' to `sched_param' to follow
	POSIX.4.

Thu Sep 12 20:12:40 1996  Ulrich Drepper  <drepper@cygnus.com>

	* db/makedb.c (usage): Print bug report address separately to
	ease translators task.
	* catgets/gencat.c (usage): Likewise.
	* locale/locale.c (usage): Likewise.
	* locale/localedef.c (usage): Likewise.

1996-09-12  Paul Eggert  <eggert@twinsun.com>

	* time/strftime.c (my_localtime_r): Define if ! HAVE_LOCALTIME_R,
	and #define localtime_r to it.	If _LIBC, use __localtime_r instead.
	(my_gmtime_r): Similar, except it's not needed if ! HAVE_TM_GMTOFF.

Thu Sep 12 14:03:29 1996  Ulrich Drepper  <drepper@cygnus.com>

	* crypt/Makefile: Include Makeconfig and add crypt object dir to
 	rpath-link so that running the check finds the new library.
	* crypt/cert.c: provide correct prototypes to prevent warnings.
	Reported by Andreas Jaeger.

	* sysdeps/mach/hurd/Makefile (rpath-link): Don't use += because
	old and new value must be glued using `:'.
	Reported by Marcus Daniels.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/locale.c10
-rw-r--r--locale/programs/localedef.c10
2 files changed, 12 insertions, 8 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index a3ffd48998..df11e1efdf 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -234,7 +234,8 @@ usage (int status)
     fprintf (stderr, gettext ("Try `%s --help' for more information.\n"),
 	     __progname);
   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\
@@ -244,9 +245,10 @@ Mandatory arguments to long options are mandatory for short options too.\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\
-Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
-	    __progname);
+  -k, --keyword-name    write names of selected keywords\n"),
+	      __progname);
+      printf (gettext ("Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"));
+    }
 
   exit (status);
 }
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 8eab9c1fa9..9df5d128de 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -383,7 +383,8 @@ usage (int status)
     fprintf (stderr, _("Try `%s --help' for more information.\n"),
 	     program_invocation_name);
   else
-    printf (_("\
+    {
+      printf (_("\
 Usage: %s [OPTION]... name\n\
 Mandatory arguments to long options are mandatory for short options too.\n\
   -c, --force               create output even if warning messages were issued\n\
@@ -396,9 +397,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       --posix               be strictly POSIX conform\n\
 \n\
 System's directory for character maps: %s\n\
-                       locale files  : %s\n\
-Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
-	    program_invocation_name, CHARMAP_PATH, LOCALE_PATH);
+                       locale files  : %s\n"),
+	      program_invocation_name, CHARMAP_PATH, LOCALE_PATH);
+      printf (gettext ("Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"));
+    }
 
   exit (status);
 }