update from main archive 960912

diff --git a/catgets/gencat.c b/catgets/gencat.c
index e989a0f..55fea2e 100644 (file)
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -202,7 +202,8 @@ usage (int status)
     fprintf (stderr, gettext ("Try `%s --help' for more information.\n"),
              program_invocation_name);
   else
-    printf(gettext ("\
+    {
+      printf(gettext ("\
 Usage: %s [OPTION]... -o OUTPUT-FILE [INPUT-FILE]...\n\
        %s [OPTION]... [OUTPUT-FILE [INPUT-FILE]...]\n\
 Mandatory arguments to long options are mandatory for short options too.\n\
@@ -212,9 +213,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -o, --output=NAME   write output to file NAME\n\
   -V, --version       output version information and exit\n\
 If INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n\
-is -, output is written to standard output.\n\
-Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
+is -, output is written to standard output.\n"),
           program_invocation_name, program_invocation_name);
+      printf (gettext ("Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"));
+    }
 
   exit (status);
 }

diff --git a/db/makedb.c b/db/makedb.c
index db99990..a62e3d8 100644 (file)
--- a/db/makedb.c
+++ b/db/makedb.c
@@ -198,7 +198,8 @@ usage (status)
     fprintf (stderr, gettext ("Try `%s --help' for more information.\n"),
              program_invocation_name);
   else
-    printf (gettext ("\
+    {
+      printf (gettext ("\
 Usage: %s [OPTION]... INPUT-FILE OUTPUT-FILE\n\
        %s [OPTION]... -o OUTPUT-FILE INPUT-FILE\n\
        %s [OPTION]... -u INPUT-FILE\n\
@@ -209,10 +210,11 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       --quiet         don't print messages while building database\n\
   -u, --undo          print content of database file, one entry a line\n\
   -V, --version       output version information and exit\n\
-If INPUT-FILE is -, input is read from standard input.\n\
-Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"),
-           program_invocation_name, program_invocation_name,
-           program_invocation_name);
+If INPUT-FILE is -, input is read from standard input.\n"),
+             program_invocation_name, program_invocation_name,
+             program_invocation_name);
+      printf (gettext ("Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"));
+    }
 
   exit (status);
 }

diff --git a/sched.h b/sched.h
new file mode 100644 (file)
index 0000000..b9bebc9
--- /dev/null
+++ b/sched.h
@@ -0,0 +1 @@
+#include "posix/sched.h"