hush: tighten up "for" variable name check.

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

diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index 743133cd1ed209c5dde88a085da11093a9969902..367f1f04d9ca6773b6ac7258a04590b8efeef04f 100644 (file)
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -4,33 +4,19 @@
  *
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
 #include "libbb.h"
 
-char *bb_simplify_path(const char *path)
+char* FAST_FUNC bb_simplify_path(const char *path)
 {
        char *s, *start, *p;
 
        if (path[0] == '/')
-               start = bb_xstrdup(path);
+               start = xstrdup(path);
        else {
-               s = xgetcwd(NULL);
+               s = xrealloc_getcwd_or_warn(NULL);
                start = concat_path_file(s, path);
                free(s);
        }
@@ -40,13 +26,16 @@ char *bb_simplify_path(const char *path)
                if (*p == '/') {
                        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;
                                }