Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/simplify_path.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/simplify_path.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/simplify_path.c

@@ -5 +5 @@
  * 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 = xrealloc_getcwd_or_warn(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;
             }
             if (*s == '.') {
-                if (s[1] == '/' || !s[1]) { /* remove extra '.' */
+                if (s[1] == '/' || !s[1]) {  /* remove extra '.' */
                     continue;
                 }
@@ -35 +26 @@
                     ++s;
                     if (p > start) {
-                        while (*--p != '/') /* omit previous dir */
+                        while (*--p != '/')  /* omit previous dir */
                             continue;
                     }
@@ -45 +36 @@
     } 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;
+    *p = '\0';
+    return p;
+}
 
-    return start;
+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);
+    }
+
+    bb_simplify_abs_path_inplace(s);
+    return s;
 }