mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
ae65d4f3c3
calls with constant strings shows a small (~10%) performance gain, strdup is typically used in error reporting code, so not performance critical. Remove the now unused __need_malloc_and_calloc related defines from stdlib.h. Rename existing uses of str(n)dup to __str(n)dup so it no longer needs to be redirected to a builtin. Also building GLIBC with -Os now no longer shows localplt or linkname space failures (partial fix for BZ #15105 and BZ #19463). [BZ #15105] [BZ #19463] * elf/dl-cache.c (_dl_load_cache_lookup): Use __strdup. * inet/rcmd.c (rcmd_af): Likewise. * inet/rexec.c (rexec_af): Likewise. * intl/dcigettext.c (_LIBC): Likewise. * intl/finddomain.c (_nl_find_domain): Use strdup expansion. * locale/loadarchive.c (_nl_load_locale_from_archive): Use __strdup. * locale/setlocale.c (setlocale): Likewise. * posix/spawn_faction_addopen.c (posix_spawn_file_actions_addopen): Likewise. * stdlib/putenv.c (putenv): Use __strndup. * sunrpc/svc_simple.c (__registerrpc): Use __strdup. * sysdeps/posix/getaddrinfo.c (gaih_inet): Use __strdup/__strndup. * include/stdlib.h (__need_malloc_and_calloc): Remove uses. (__Need_M_And_C) Remove define/undef. * stdlib/stdlib.h (__need_malloc_and_calloc): Remove uses. (__malloc_and_calloc_defined): Remove define. * string/bits/string2.h (__strdup): Remove define. (strdup): Likewise. (__strndup): Likewise. (strndup): Likewise.
63 lines
1.9 KiB
C
63 lines
1.9 KiB
C
/* Copyright (C) 2000-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "spawn_int.h"
|
|
|
|
/* Add an action to FILE-ACTIONS which tells the implementation to call
|
|
`open' for the given file during the `spawn' call. */
|
|
int
|
|
posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
|
|
int fd, const char *path, int oflag,
|
|
mode_t mode)
|
|
{
|
|
struct __spawn_action *rec;
|
|
|
|
if (!__spawn_valid_fd (fd))
|
|
return EBADF;
|
|
|
|
char *path_copy = __strdup (path);
|
|
if (path_copy == NULL)
|
|
return ENOMEM;
|
|
|
|
/* Allocate more memory if needed. */
|
|
if (file_actions->__used == file_actions->__allocated
|
|
&& __posix_spawn_file_actions_realloc (file_actions) != 0)
|
|
{
|
|
/* This can only mean we ran out of memory. */
|
|
free (path_copy);
|
|
return ENOMEM;
|
|
}
|
|
|
|
/* Add the new value. */
|
|
rec = &file_actions->__actions[file_actions->__used];
|
|
rec->tag = spawn_do_open;
|
|
rec->action.open_action.fd = fd;
|
|
rec->action.open_action.path = path_copy;
|
|
rec->action.open_action.oflag = oflag;
|
|
rec->action.open_action.mode = mode;
|
|
|
|
/* Account for the new entry. */
|
|
++file_actions->__used;
|
|
|
|
return 0;
|
|
}
|