Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / misc / dirname.c

diff --git a/misc/dirname.c b/misc/dirname.c
index 26c5a8b1ee870cf1b00313eb35ac36adce17e4f0..0ddae888659c8de253b8bc408620214d5787de8c 100644 (file)
--- a/misc/dirname.c
+++ b/misc/dirname.c
@@ -1,22 +1,21 @@
 /* dirname - return directory part of PATH.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996-2015 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.
+   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
-   Library General Public License for more details.
+   Lesser 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.  */
+   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 <libgen.h>
 #include <string.h>
@@ -31,17 +30,46 @@ dirname (char *path)
   /* Find last '/'.  */
   last_slash = path != NULL ? strrchr (path, '/') : NULL;
 
-  if (last_slash == path)
-    /* The last slash is the first character in the string.  We have to
-       return "/".  */
-    ++last_slash;
-  else if (last_slash != NULL && last_slash[1] == '\0')
-    /* The '/' is the last character, we have to look further.  */
-    last_slash = memchr (path, last_slash - path, '/');
+  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)
-    /* Terminate the path.  */
-    last_slash[0] = '\0';
+    {
+      /* 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;
+       }
+      else
+       last_slash = runp;
+
+      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