Rewritten by Manuel Novoa III.
This commit is contained in:
parent
c639a35f50
commit
0a68590314
@ -3,7 +3,7 @@
|
|||||||
* simplify_path implementation for busybox
|
* simplify_path implementation for busybox
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* Copyright (C) 2001 Vladimir N. Oleynik <dzo@simtreas.ru>
|
* Copyright (C) 2001 Manuel Novoa III <mjn3@opensource.lineo.com>
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -26,17 +26,9 @@
|
|||||||
|
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
|
|
||||||
static inline char *strcpy_overlap(char *dst, const char *src)
|
|
||||||
{
|
|
||||||
char *ptr = dst;
|
|
||||||
|
|
||||||
do *dst++ = *src; while (*src++);
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
char *simplify_path(const char *path)
|
char *simplify_path(const char *path)
|
||||||
{
|
{
|
||||||
char *s, *start, *next;
|
char *s, *start, *p;
|
||||||
|
|
||||||
if (path[0] == '/')
|
if (path[0] == '/')
|
||||||
start = xstrdup(path);
|
start = xstrdup(path);
|
||||||
@ -45,34 +37,31 @@ char *simplify_path(const char *path)
|
|||||||
start = concat_path_file(s, path);
|
start = concat_path_file(s, path);
|
||||||
free(s);
|
free(s);
|
||||||
}
|
}
|
||||||
s = start;
|
p = s = start;
|
||||||
/* remove . and .. */
|
|
||||||
while(*s) {
|
|
||||||
if(*s++ == '/' && (*s == '/' || *s == 0)) {
|
|
||||||
/* remove duplicate and trailing slashes */
|
|
||||||
s = strcpy_overlap(s-1, s);
|
|
||||||
}
|
|
||||||
else if(*(s-1) == '.' && *(s-2)=='/') {
|
|
||||||
if(*s == '/' || *s == 0) {
|
|
||||||
/* remove . */
|
|
||||||
s = strcpy_overlap(s-1, s); /* maybe set // */
|
|
||||||
s--;
|
|
||||||
} else if(*s == '.') {
|
|
||||||
next = s+1; /* set after ".." */
|
|
||||||
if(*next == '/' || *next == 0) { /* "../" */
|
|
||||||
if((s-=2) > start)
|
|
||||||
/* skip previous dir */
|
|
||||||
do s--; while(*s != '/');
|
|
||||||
/* remove previous dir */
|
|
||||||
strcpy_overlap(s, next);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
do {
|
||||||
|
if (*p == '/') {
|
||||||
|
if (*s == '/') { /* skip duplicate (or initial) slash */
|
||||||
|
continue;
|
||||||
|
} else if (*s == '.') {
|
||||||
|
if (s[1] == '/' || s[1] == 0) { /* remove extra '.' */
|
||||||
|
continue;
|
||||||
|
} else if ((s[1] == '.') && (s[2] == '/' || s[2] == 0)) {
|
||||||
|
++s;
|
||||||
|
if (p > start) {
|
||||||
|
while (*--p != '/'); /* omit previous dir */
|
||||||
|
}
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(start[0]==0) {
|
*++p = *s;
|
||||||
start[0]='/';
|
} while (*++s);
|
||||||
start[1]=0;
|
|
||||||
|
if ((p == start) || (*p != '/')) { /* not a trailing slash */
|
||||||
|
++p; /* so keep last character */
|
||||||
}
|
}
|
||||||
|
*p = 0;
|
||||||
|
|
||||||
return start;
|
return start;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user