OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2000-08-23  Ulrich Drepper  <drepper@redhat.com>

	* iconv/gconv_conf.c (add_module): Remove some unneeded code to
	avoid adding double slashes.
This commit is contained in:
Ulrich Drepper 2000-08-23 20:39:41 +00:00
parent 91ca07d8ea
commit f4942eca1e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-08-23 Ulrich Drepper <drepper@redhat.com>
* iconv/gconv_conf.c (add_module): Remove some unneeded code to
avoid adding double slashes.
2000-08-23 Jakub Jelinek <jakub@redhat.com>
* dirent/dirent.h (alphasort, versionsort): Move __attribute_pure__

10
iconv/gconv_conf.c
View File

@ -276,9 +276,6 @@ add_module (char *rp, const char *directory, size_t dir_len, void **modules,
return;
if (module[0] == '/')
dir_len = 0;
else
/* Increment by one for the slash. */
++dir_len;
/* See whether we must add the ending. */
need_ext = 0;
@ -318,11 +315,8 @@ add_module (char *rp, const char *directory, size_t dir_len, void **modules,
if (dir_len == 0)
tmp = (char *) new_module->module_name;
else
{
tmp = __mempcpy ((char *) new_module->module_name,
directory, dir_len - 1);
*tmp++ = '/';
}
tmp = __mempcpy ((char *) new_module->module_name,
directory, dir_len);
tmp = __mempcpy (tmp, module, wp - module);