busybox/libbb/simplify_path.c
Denis Vlasenko 1cf4a0eb81 httpd: simplify insane conf file parser
function                                             old     new   delta
bb_simplify_abs_path_inplace                           -      98     +98
parse_expr                                           824     832      +8
passwd_main                                         1025    1027      +2
evalvar                                             1374    1376      +2
parse_command                                       1463    1460      -3
bb_simplify_path                                     137      55     -82
parse_conf                                          1572    1422    -150
------------------------------------------------------------------------------
(add/remove: 3/2 grow/shrink: 3/3 up/down: 126/-251)         Total: -125 bytes
2009-04-22 13:49:16 +00:00

60 lines
1.1 KiB
C

/* vi: set sw=4 ts=4: */
/*
* bb_simplify_path implementation for busybox
*
* Copyright (C) 2001 Manuel Novoa III <mjn3@codepoet.org>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
char* FAST_FUNC bb_simplify_abs_path_inplace(char *start)
{
char *s, *p;
p = s = start;
do {
if (*p == '/') {
if (*s == '/') { /* skip duplicate (or initial) slash */
continue;
}
if (*s == '.') {
if (s[1] == '/' || !s[1]) { /* remove extra '.' */
continue;
}
if ((s[1] == '.') && (s[2] == '/' || !s[2])) {
++s;
if (p > start) {
while (*--p != '/') /* omit previous dir */
continue;
}
continue;
}
}
}
*++p = *s;
} while (*++s);
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);
}
bb_simplify_abs_path_inplace(s);
return s;
}