mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

update from main archive 960922

Browse Source 
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.

	(__get_nproc_conf): New function.
This commit is contained in:
Ulrich Drepper 1996-09-23 00:24:55 +00:00
parent 7816fbdf7a
commit e320cbc913
6 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -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>

11
catgets/gencat.c
View File

@ -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);
}

13
db/makedb.c
View File

@ -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)

10
locale/programs/locale.c
View File

@ -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);
}

11
locale/programs/localedef.c
View File

@ -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);
}

12
sysdeps/unix/sysv/linux/init-first.c
View File

@ -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 ();
}