mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
c891b2df08
2001-04-03 Ulrich Drepper <drepper@redhat.com> * misc/dirname.c (dirname): Handle multiple slashes correctly. 2001-04-03 Martin Schwidefsky <schwidefsky@de.ibm.com> * sysdeps/s390/s390-64/initfini.c: Fix __gmon_start__ GOT access. 2001-04-03 Martin Schwidefsky <schwidefsky@de.ibm.com> * sysdeps/s390/s390-32/bcopy.S: Optimize for speed. * sysdeps/s390/s390-64/bcopy.S: Likewise. * sysdeps/s390/s390-32/mempcy.S: Likewise. * sysdeps/s390/s390-64/memcpy.S: Likewise. 2001-04-02 Bruno Haible <haible@clisp.cons.org> * manual/message.texi (Advanced gettext functions): More specific syntax in the plural formula examples. 2001-04-02 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * sysdeps/powerpc/atomicity.h: Silence warnings. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/powerpc/register-dump.h: Likewise. * sysdeps/powerpc/fpu/s_lrint.c: Likewise. 2001-04-02 Andreas Jaeger <aj@suse.de> * misc/tst-dirname.c (main): Add more tests, derived from a bug report by Michael Kerrisk <mtk16@ext.canterbury.ac.nz>. 2001-04-01 Andreas Jaeger <aj@suse.de> * debug/xtrace.sh (pcprofileso): Use SLIBDIR since libpcprofile.so is installed there. * malloc/memusage.sh (memusageso): Likewise for libmemusage.so. 2001-04-01 H.J. Lu <hjl@gnu.org> * posix/annexc.c (macrofile): Renamed from TMPFILE and set to tmpnam (NULL). * stdlib/isomac.c (macrofile): Likewise. 2001-03-30 Thorsten Kukuk <kukuk@suse.de> * inet/rcmd.c: Allow AF_UNSPEC as parameter. * nis/ypclnt.c (yp_all): Print error message only at last try, check for protocoll error only if we don't have a network error.
80 lines
2.5 KiB
C
80 lines
2.5 KiB
C
/* dirname - return directory part of PATH.
|
|
Copyright (C) 1996, 2000, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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 <libgen.h>
|
|
#include <string.h>
|
|
|
|
|
|
char *
|
|
dirname (char *path)
|
|
{
|
|
static const char dot[] = ".";
|
|
char *last_slash;
|
|
|
|
/* Find last '/'. */
|
|
last_slash = path != NULL ? strrchr (path, '/') : NULL;
|
|
|
|
if (last_slash != NULL && last_slash != path && last_slash[1] == '\0')
|
|
{
|
|
/* Determine whether all remaining characters are slashes. */
|
|
char *runp;
|
|
|
|
for (runp = last_slash; runp != path; --runp)
|
|
if (runp[-1] != '/')
|
|
break;
|
|
|
|
/* The '/' is the last character, we have to look further. */
|
|
if (runp != path)
|
|
last_slash = __memrchr (path, '/', runp - path);
|
|
}
|
|
|
|
if (last_slash != NULL)
|
|
{
|
|
/* Determine whether all remaining characters are slashes. */
|
|
char *runp;
|
|
|
|
for (runp = last_slash; runp != path; --runp)
|
|
if (runp[-1] != '/')
|
|
break;
|
|
|
|
/* Terminate the path. */
|
|
if (runp == path)
|
|
{
|
|
/* The last slash is the first character in the string. We have to
|
|
return "/". As a special case we have to return "//" if there
|
|
are exactly two slashes at the beginning of the string. See
|
|
XBD 4.10 Path Name Resolution for more information. */
|
|
if (last_slash == path + 1)
|
|
++last_slash;
|
|
else
|
|
last_slash = path + 1;
|
|
}
|
|
|
|
last_slash[0] = '\0';
|
|
}
|
|
else
|
|
/* This assignment is ill-designed but the XPG specs require to
|
|
return a string containing "." in any case no directory part is
|
|
found and so a static and constant string is required. */
|
|
path = (char *) dot;
|
|
|
|
return path;
|
|
}
|