fix up potential printf's with unsafe format strings

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

diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index cf5b838a1201dbd272c71a6506de5e09e9782f61..f80e3e8a5eef53ddeba2cd365bbd39506cfea8f9 100644 (file)
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -1,55 +1,32 @@
 /* vi: set sw=4 ts=4: */
 /*
- * simplify_path implementation for busybox
+ * bb_simplify_path implementation for busybox
  *
+ * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Copyright (C) 2001  Manuel Novoa III  <mjn3@opensource.lineo.com>
- *
- *
- * 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 *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 */
                                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;
                                }
@@ -61,7 +38,22 @@ char *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;
 }