mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
c4563d2d66
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
172 lines
4.3 KiB
C
172 lines
4.3 KiB
C
/* Determine current working directory. Linux version.
|
|
Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#include <sysdep.h>
|
|
#include <sys/syscall.h>
|
|
|
|
|
|
/* The "proc" filesystem provides an easy method to retrieve the value.
|
|
For each process, the corresponding directory contains a symbolic link
|
|
named `cwd'. Reading the content of this link immediate gives us the
|
|
information. But we have to take care for systems which do not have
|
|
the proc filesystem mounted. Use the POSIX implementation in this case. */
|
|
static char *generic_getcwd (char *buf, size_t size) internal_function;
|
|
|
|
#ifdef __NR_getcwd
|
|
/* Kernel 2.1.92 introduced a third way to get the current working
|
|
directory: a syscall. We've got to be careful that even when
|
|
compiling under 2.1.92+ the libc still runs under older kernels. */
|
|
extern int __syscall_getcwd (char *buf, unsigned long size);
|
|
static int no_syscall_getcwd;
|
|
static int have_new_dcache;
|
|
#else
|
|
# define no_syscall_getcwd 1
|
|
static int have_new_dcache = 1;
|
|
#endif
|
|
|
|
char *
|
|
__getcwd (char *buf, size_t size)
|
|
{
|
|
int save_errno;
|
|
char *path;
|
|
int n;
|
|
char *result;
|
|
size_t alloc_size = size;
|
|
|
|
if (no_syscall_getcwd && !have_new_dcache)
|
|
return generic_getcwd (buf, size);
|
|
|
|
if (size == 0)
|
|
{
|
|
if (buf != NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NULL;
|
|
}
|
|
|
|
alloc_size = PATH_MAX;
|
|
}
|
|
|
|
if (buf != NULL)
|
|
path = buf;
|
|
else
|
|
{
|
|
path = malloc (alloc_size);
|
|
if (path == NULL)
|
|
return NULL;
|
|
}
|
|
|
|
save_errno = errno;
|
|
|
|
#ifdef __NR_getcwd
|
|
if (!no_syscall_getcwd)
|
|
{
|
|
int retval;
|
|
|
|
retval = INLINE_SYSCALL (getcwd, 2, path, alloc_size);
|
|
if (retval >= 0)
|
|
{
|
|
if (buf == NULL)
|
|
{
|
|
buf = realloc (path, (size_t) retval);
|
|
if (buf == NULL)
|
|
/* `realloc' failed but we still have the original string. */
|
|
buf = path;
|
|
}
|
|
return buf;
|
|
}
|
|
|
|
if (errno == ENOSYS)
|
|
{
|
|
no_syscall_getcwd = 1;
|
|
have_new_dcache = 1; /* Now we will try the /proc method. */
|
|
}
|
|
else if (errno != ERANGE || buf != NULL)
|
|
{
|
|
if (buf == NULL)
|
|
free (path);
|
|
return NULL;
|
|
}
|
|
|
|
__set_errno (save_errno);
|
|
}
|
|
#endif
|
|
|
|
n = __readlink ("/proc/self/cwd", path, alloc_size - 1);
|
|
if (n != -1)
|
|
{
|
|
if (path[0] == '/')
|
|
{
|
|
if (n >= alloc_size - 1)
|
|
{
|
|
if (buf == NULL)
|
|
free (path);
|
|
return NULL;
|
|
}
|
|
|
|
path[n] = '\0';
|
|
if (buf == NULL)
|
|
{
|
|
buf = realloc (path, (size_t) n + 1);
|
|
if (buf == NULL)
|
|
/* `relloc' failed but we still have the original string. */
|
|
buf = path;
|
|
}
|
|
return buf;
|
|
}
|
|
else
|
|
have_new_dcache = 0;
|
|
}
|
|
|
|
/* Set to have_new_dcache only if error indicates that proc doesn't
|
|
exist. */
|
|
if (errno != EACCES && errno != ENAMETOOLONG)
|
|
have_new_dcache = 0;
|
|
|
|
/* Something went wrong. Restore the error number and use the generic
|
|
version. */
|
|
__set_errno (save_errno);
|
|
|
|
/* Don't put restrictions on the length of the path unless the user does. */
|
|
if (size == 0)
|
|
{
|
|
free (path);
|
|
path = NULL;
|
|
}
|
|
|
|
result = generic_getcwd (path, size);
|
|
|
|
if (result == NULL && buf == NULL && size != 0)
|
|
free (path);
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__getcwd, getcwd)
|
|
|
|
/* Get the code for the generic version. */
|
|
#define GETCWD_RETURN_TYPE static char * internal_function
|
|
#define __getcwd generic_getcwd
|
|
#include <sysdeps/posix/getcwd.c>
|