New upstream version 2.4.0upstream/2.4.0

1 files changed, 87 insertions, 64 deletions

diff --git a/src/compat/compat-dirname.c b/src/compat/compat-dirname.c
index 8878595..7687108 100644
--- a/src/compat/compat-dirname.c
+++ b/src/compat/compat-dirname.c
@@ -41,79 +41,102 @@
 static const char *
 __memrchr(const char *str, int c, size_t n)
 {
-  const char *end = str;
-
-  end += n - 1; /* Go to the end of the string */
-  while (end >= str) {
-    if(c == *end)
-      return end;
-    else
-      end--;
-  }
-  return NULL;
+    const char *end = str;
+
+    end += n - 1; /* Go to the end of the string */
+    while (end >= str) {
+        if (c == *end)
+        {
+            return end;
+        }
+        else
+        {
+            end--;
+        }
+    }
+    return NULL;
 }
 
 /* Modified version based on glibc-2.14.1 by Ulrich Drepper <drepper@akkadia.org>
  * This version is extended to handle both / and \ in path names.
  */
 char *
-dirname (char *path)
+dirname(char *path)
 {
-  static const char dot[] = ".";
-  char *last_slash;
-  char separator = '/';
-
-  /* Find last '/'.  */
-  last_slash = path != NULL ? strrchr (path, '/') : NULL;
-  /* If NULL, check for \ instead ... might be Windows a path */
-  if (!last_slash) {
-    last_slash = path != NULL ? strrchr (path, '\\') : NULL;
-    separator = last_slash ? '\\' : '/';  /* Change the separator if \ was found */
-  }
-
-  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] != separator)
-	  break;
-
-      /* The '/' is the last character, we have to look further.  */
-      if (runp != path)
-	last_slash = (char *) __memrchr (path, separator, runp - path);
+    static const char dot[] = ".";
+    char *last_slash;
+    char separator = '/';
+
+    /* Find last '/'.  */
+    last_slash = path != NULL ? strrchr(path, '/') : NULL;
+    /* If NULL, check for \ instead ... might be Windows a path */
+    if (!last_slash)
+    {
+        last_slash = path != NULL ? strrchr(path, '\\') : NULL;
+        separator = last_slash ? '\\' : '/'; /* Change the separator if \ was found */
+    }
+
+    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] != separator)
+            {
+                break;
+            }
+
+        /* The '/' is the last character, we have to look further.  */
+        if (runp != path)
+        {
+            last_slash = (char *) __memrchr(path, separator, 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] != separator)
+            {
+                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
+         * found and so a static and constant string is required.  */
+        path = (char *) dot;
     }
 
-  if (last_slash != NULL) {
-      /* Determine whether all remaining characters are slashes.  */
-      char *runp;
-
-      for (runp = last_slash; runp != path; --runp)
-	if (runp[-1] != separator)
-	  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
-       found and so a static and constant string is required.  */
-    path = (char *) dot;
-
-  return path;
+    return path;
 }
 
 #endif /* HAVE_DIRNAME */