about summary refs log tree commit diff
path: root/intl/localealias.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-11-07 21:46:52 +0000
committerRoland McGrath <roland@gnu.org>1995-11-07 21:46:52 +0000
commit86d2c878acad4d2f16d0af6fe6a030b90815362d (patch)
tree69e150aefd1002c3411b34da02bf852525c01ff7 /intl/localealias.c
parent51093422b2ea7d61c17e4ac55af61ba9558d18d4 (diff)
downloadglibc-86d2c878acad4d2f16d0af6fe6a030b90815362d.tar.gz
glibc-86d2c878acad4d2f16d0af6fe6a030b90815362d.tar.xz
glibc-86d2c878acad4d2f16d0af6fe6a030b90815362d.zip
Tue Nov 7 12:29:46 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* elf/linux-compat.c: New file.
	* elf/Makefile (distribute): Add linux-compat.c.
	(generated): Add librtld.so.
	[$(config-os)=linux*] (extra-objs): Add linux-compat.so.
	[$(config-os)=linux*] (extra-objs): Add ld-linux.so.1.
	(librtld.so): New target.
	(ld.so, ld-linux.so.1): Make from librtld.so.

	* elf/rtld.c (dl_main): Instead of weak call to _dl_compat_init,
	call our own DT_INIT if we have one (and then clear it).
	(__dgettext): New weak function.

	* intl/localealias.c (read_alias_file): Avoid sprintf; use memcpy
	by hand instead.

	* sysdeps/generic/_strerror.c (_strerror_internal): Use _itoa
	instead of snprintf.

	* sysdeps/mach/_strerror.c (_strerror_internal): Don't write
	BUF[BUFLEN].

	* elf/rtld.c (rtld_map): New static variable.
	(_dl_start): Use a differently named local BOOTSTRAP_MAP for the
	bootstrapping.  Then copy data into `rtld_map'.
	(dl_main): Finish filling in rtld_map and link it into the chain,
	instead of allocating a new structure.
	(dl_main): Call _dl_compat_init if it is defined (use weak ref).

	* elf/dlsym.c: Fix last change: move REF out of `doit'.


	control.
	using it.

	and cwdir ports.
	functions.
	these.
	$(libdir)(rtld-installed-name).

	leading zeroes.

	in the rhs.
	pattern rule.


	never know.
	(fork): Use symbol_set_* macros for _hurd_fork_locks.
	* sysdeps/unix/sysv/sysv4/linux/i386/sysdep.S (__syscall_error):
 	instead of unix/sysv.

	-dynamic-linker.

	(__printf_fp): Last arg ARGS is now `const void **const';

	locale/C-ctype.c.
	* sysdeps/mach/hurd/sigsuspend.c: Likewise.
	* sysdeps/mach/hurd/mips/sigreturn.c: Likewise.
	alias gethostname.
	setitmr
	setpgrp
	(_S_msg_get_exec_flags, _S_msg_set_exec_flags,
	(abort_thread, abort_rpcs): Take same new arg and pass it through.
Diffstat (limited to 'intl/localealias.c')
-rw-r--r--intl/localealias.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/intl/localealias.c b/intl/localealias.c
index 716657c844..fc3bc1238b 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -150,9 +150,11 @@ read_alias_file (fname, fname_len)
   FILE *fp;
   char *full_fname;
   size_t added;
+  static const char aliasfile[] = "/locale.alias";
 
-  full_fname = (char *) alloca (fname_len + sizeof ("/locale.alias"));
-  sprintf (full_fname, "%.*s/locale.alias", fname_len, fname);
+  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+  memcpy (full_fname, fname, fname_len);
+  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
 
   fp = fopen (full_fname, "r");
   if (fp == NULL)