diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | catgets/gencat.c | 11 | ||||
| -rw-r--r-- | db/makedb.c | 13 | ||||
| -rw-r--r-- | locale/programs/locale.c | 10 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 11 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 12 |
6 files changed, 64 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 3267bd6e23..b538fa6096 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,19 @@ +Sun Sep 22 15:18:41 1996 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/unix/sysv/linux/init-first.c: Define dummy function + `_dl_start' so that linking fails if this file should ever be used + in ld.so. + + * catgets/gencat.c (main): Change --version message according to + RMS' last standard revision. + * db/makedb.c: Likewise. + * locale/programs/locale.c: Likewise. + * locale/programs/localedef.c: Likewise. + Sat Sep 21 23:42:39 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/getsysstats.c: Include <sys/sysinfo.h>. - (__get_nproc_conf): New function. + (__get_nproc_conf): New function. Sun Sep 22 03:40:52 1996 Ulrich Drepper <drepper@cygnus.com> diff --git a/catgets/gencat.c b/catgets/gencat.c index 55fea2ef4f..7ba9258be3 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -165,8 +165,15 @@ main (int argc, char *argv[]) /* Version information is requested. */ if (do_version) { - fprintf (stderr, "%s - GNU %s %s\n", program_invocation_name, - PACKAGE, VERSION); + fprintf (stderr, "gencat - GNU %s %s\n", PACKAGE, VERSION); + fprintf (stderr, _("\ +Copyright (C) %s Free Software Foundation, Inc.\n\ +This is free software; see the source for copying conditions. There is NO\n\ +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +"), "1996"); + fprintf (stderr, _("Written by %s\n"), + "Ulrich Drepper <drepper@cygnus.com>"); + exit (EXIT_SUCCESS); } diff --git a/db/makedb.c b/db/makedb.c index a62e3d848b..cfe6aed157 100644 --- a/db/makedb.c +++ b/db/makedb.c @@ -114,7 +114,18 @@ main (argc, argv) /* Version information is requested. */ if (do_version) - printf ("%s - GNU %s %s\n", program_invocation_name, PACKAGE, VERSION); + { + fprintf (stderr, "makedb - GNU %s %s\n", PACKAGE, VERSION); + fprintf (stderr, _("\ +Copyright (C) %s Free Software Foundation, Inc.\n\ +This is free software; see the source for copying conditions. There is NO\n\ +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +"), "1996"); + fprintf (stderr, _("Written by %s\n"), + "Ulrich Drepper <drepper@cygnus.com>"); + + exit (EXIT_SUCCESS); + } /* Help is requested. */ if (do_help) diff --git a/locale/programs/locale.c b/locale/programs/locale.c index df11e1efdf..ea15c87638 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -183,7 +183,15 @@ main (int argc, char *argv[]) /* Version information is requested. */ if (do_version) { - fprintf (stderr, "%s - GNU %s %s\n", __progname, PACKAGE, VERSION); + fprintf (stderr, "locale - GNU %s %s\n", PACKAGE, VERSION); + fprintf (stderr, _("\ +Copyright (C) %s Free Software Foundation, Inc.\n\ +This is free software; see the source for copying conditions. There is NO\n\ +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +"), "1995, 1996"); + fprintf (stderr, _("Written by %s\n"), + "Ulrich Drepper <drepper@cygnus.com>"); + exit (EXIT_SUCCESS); } diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 9df5d128de..1eae6e75d0 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -173,8 +173,15 @@ main (int argc, char *argv[]) /* Version information is requested. */ if (do_version) { - fprintf (stderr, "%s - GNU %s %s\n", program_invocation_short_name, - PACKAGE, VERSION); + fprintf (stderr, "localedef - GNU %s %s\n", PACKAGE, VERSION); + fprintf (stderr, _("\ +Copyright (C) %s Free Software Foundation, Inc.\n\ +This is free software; see the source for copying conditions. There is NO\n\ +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +"), "1995, 1996"); + fprintf (stderr, _("Written by %s\n"), + "Ulrich Drepper <drepper@cygnus.com>"); + exit (0); } diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index 9f0a3c0f51..75ada19610 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -87,3 +87,15 @@ __libc_init_first (void) SYSDEP_CALL_INIT(__libc_init_first, init); #endif + + +/* This function is defined here so that if this file ever gets into + ld.so we will get a link error. Having this file silently included + in ld.so causes disaster, because the _init definition above will + cause ld.so to gain an init function, which is not a cool thing. */ + +void +_dl_start () +{ + abort (); +} |