httpd: fix handling of range requests

[oweals/busybox.git] / libbb / simplify_path.c

diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index b714c66b6c586e96636c9b352d6df7e0efffd150..89dc5bdf21c2c3e19295327ec03605456ab3a3fd 100644 (file)
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -4,35 +4,29 @@
  *
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
-char *bb_simplify_path(const char *path)
+char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
 {
-       char *s, *start, *p;
+       char *s, *p;
 
-       if (path[0] == '/')
-               start = xstrdup(path);
-       else {
-               s = xgetcwd(NULL);
-               start = concat_path_file(s, path);
-               free(s);
-       }
        p = s = start;
-
        do {
                if (*p == '/') {
-                       if (*s == '/') {        /* skip duplicate (or initial) slash */
+                       if (*s == '/') {  /* skip duplicate (or initial) slash */
                                continue;
-                       } else if (*s == '.') {
-                               if (s[1] == '/' || s[1] == 0) { /* remove extra '.' */
+                       }
+                       if (*s == '.') {
+                               if (s[1] == '/' || !s[1]) {  /* remove extra '.' */
                                        continue;
-                               } else if ((s[1] == '.') && (s[2] == '/' || s[2] == 0)) {
+                               }
+                               if ((s[1] == '.') && (s[2] == '/' || !s[2])) {
                                        ++s;
                                        if (p > start) {
-                                               while (*--p != '/');    /* omit previous dir */
+                                               while (*--p != '/')  /* omit previous dir */
+                                                       continue;
                                        }
                                        continue;
                                }
@@ -41,10 +35,25 @@ char *bb_simplify_path(const char *path)
                *++p = *s;
        } while (*++s);
 
-       if ((p == start) || (*p != '/')) {      /* not a trailing slash */
-               ++p;                                    /* so keep last character */
+       if ((p == start) || (*p != '/')) {  /* not a trailing slash */
+               ++p;  /* so keep last character */
+       }
+       *p = '\0';
+       return p;
+}
+
+char* FAST_FUNC bb_simplify_path(const char *path)
+{
+       char *s, *p;
+
+       if (path[0] == '/')
+               s = xstrdup(path);
+       else {
+               p = xrealloc_getcwd_or_warn(NULL);
+               s = concat_path_file(p, path);
+               free(p);
        }
-       *p = 0;
 
-       return start;
+       bb_simplify_abs_path_inplace(s);
+       return s;
 }