lineedit: do not hang on error, but return error indicator.

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

diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index 367f1f04d9ca6773b6ac7258a04590b8efeef04f..3818d32be3027cff8b36d5fdda1fd50cb7cf1dbb 100644 (file)
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -4,24 +4,15 @@
  *
  * 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* FAST_FUNC 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 */
@@ -47,7 +38,22 @@ char* FAST_FUNC bb_simplify_path(const char *path)
        if ((p == start) || (*p != '/')) {      /* not a trailing slash */
                ++p;                                    /* so keep last character */
        }
-       *p = 0;
+       *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);
+       }
 
-       return start;
+       bb_simplify_abs_path_inplace(s);
+       return s;
 }