moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] path_simplify doc update.

Browse Source
This commit is contained in:
hniksic 2003-09-22 05:03:34 -07:00
parent e6d8f06093
commit f78016fb95
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/url.c
View File

@ -1611,19 +1611,18 @@ find_last_char (const char *b, const char *e, char c)
} }
/* Resolve "." and ".." elements of PATH by destructively modifying /* Resolve "." and ".." elements of PATH by destructively modifying
PATH. "." is resolved by removing that path element, and ".." is PATH and return non-zero if PATH has been modified, zero otherwise.
resolved by removing the preceding path element. Single leading
and trailing slashes are preserved.
Return non-zero if any changes have been made. The algorithm is in spirit similar to the one described in rfc1808,
although implemented differently, in one pass. To recap, path
elements containing only "." are removed, and ".." is taken to mean
"back up one element". Single leading and trailing slashes are
preserved.
For example, "a/b/c/./../d/.." will yield "a/b/". More exhaustive For example, "a/b/c/./../d/.." will yield "a/b/". More exhaustive
test examples are provided below. If you change anything in this test examples are provided below. If you change anything in this
function, run test_path_simplify to make sure you haven't broken a function, run test_path_simplify to make sure you haven't broken a
test case. test case. */
A previous version of this function was based on path_simplify()
from GNU Bash, but it has been rewritten for Wget 1.8.1. */
static int static int
path_simplify (char *path) path_simplify (char *path)
@ -1651,7 +1650,6 @@ path_simplify (char *path)
{ {
/* Handle "../" by retreating the tortoise by one path /* Handle "../" by retreating the tortoise by one path
element -- but not past beggining of PATH. */ element -- but not past beggining of PATH. */
if (t > path) if (t > path)
{ {
/* Move backwards until B hits the beginning of the /* Move backwards until B hits the beginning of the
@ -1663,12 +1661,12 @@ path_simplify (char *path)
} }
else if (*h == '/') else if (*h == '/')
{ {
/* Ignore empty path elements. Supporting them is hard (in /* Ignore empty path elements. Supporting them well is hard
which directory do you save http://x.com///y.html?), and (where do you save "http://x.com///y.html"?), and they
they don't bring any practical gain. Plus, they break don't bring any practical gain. Plus, they break our
our filesystem-influenced assumptions: allowing empty filesystem-influenced assumptions: allowing them would
path elements means that "x/y/../z" simplifies to make "x/y//../z" simplify to "x/y/z", whereas most people
"x/y/z", whereas most people would expect "x/z". */ would expect "x/z". */
++h; ++h;
} }
else else