emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

teach find_root_device to deal with /dev/ subdirs

Browse Source 
(by "Kirill K. Smirnov" <lich@math.spbu.ru>)
This commit is contained in:
Denis Vlasenko
2007-04-13 23:59:52 +00:00
parent 334fa9bcb5
commit 16abcd90ae
9 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
networking/httpd.c
View File

@ -1573,7 +1573,7 @@ static void handleIncoming(void)
}
/* algorithm stolen from libbb bb_simplify_path(),
but don't strdup and reducing trailing slash and protect out root */
* but don't strdup and reducing trailing slash and protect out root */
purl = test = url;
do {
if (*purl == '/') {
@ -1583,18 +1583,18 @@ static void handleIncoming(void)
}
if (*test == '.') {
/* skip extra '.' */
if (test[1] == '/' || test[1] == 0) {
if (test[1] == '/' || !test[1]) {
continue;
} else
}
/* '..': be careful */
if (test[1] == '.' && (test[2] == '/' || test[2] == 0)) {
if (test[1] == '.' && (test[2] == '/' || !test[2])) {
++test;
if (purl == url) {
/* protect out root */
goto BAD_REQUEST;
}
while (*--purl != '/') /* omit previous dir */;
continue;
continue;
}
}
}