diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
commit | fb132e47370378474c68ad22c1c0cb2ccee178de (patch) | |
tree | 4f78d0fdd1c2fa2341c7d9bb17f9d98d099a238c /libbb/simplify_path.c | |
parent | 66cb7bed33da605674c3d24734466b8e8a60e337 (diff) | |
download | busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.gz busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.bz2 busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.zip |
whitespace cleanup
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'libbb/simplify_path.c')
-rw-r--r-- | libbb/simplify_path.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c index 3818d32be..89dc5bdf2 100644 --- a/libbb/simplify_path.c +++ b/libbb/simplify_path.c | |||
@@ -15,17 +15,17 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start) | |||
15 | p = s = start; | 15 | p = s = start; |
16 | do { | 16 | do { |
17 | if (*p == '/') { | 17 | if (*p == '/') { |
18 | if (*s == '/') { /* skip duplicate (or initial) slash */ | 18 | if (*s == '/') { /* skip duplicate (or initial) slash */ |
19 | continue; | 19 | continue; |
20 | } | 20 | } |
21 | if (*s == '.') { | 21 | if (*s == '.') { |
22 | if (s[1] == '/' || !s[1]) { /* remove extra '.' */ | 22 | if (s[1] == '/' || !s[1]) { /* remove extra '.' */ |
23 | continue; | 23 | continue; |
24 | } | 24 | } |
25 | if ((s[1] == '.') && (s[2] == '/' || !s[2])) { | 25 | if ((s[1] == '.') && (s[2] == '/' || !s[2])) { |
26 | ++s; | 26 | ++s; |
27 | if (p > start) { | 27 | if (p > start) { |
28 | while (*--p != '/') /* omit previous dir */ | 28 | while (*--p != '/') /* omit previous dir */ |
29 | continue; | 29 | continue; |
30 | } | 30 | } |
31 | continue; | 31 | continue; |
@@ -35,8 +35,8 @@ char* FAST_FUNC bb_simplify_abs_path_inplace(char *start) | |||
35 | *++p = *s; | 35 | *++p = *s; |
36 | } while (*++s); | 36 | } while (*++s); |
37 | 37 | ||
38 | if ((p == start) || (*p != '/')) { /* not a trailing slash */ | 38 | if ((p == start) || (*p != '/')) { /* not a trailing slash */ |
39 | ++p; /* so keep last character */ | 39 | ++p; /* so keep last character */ |
40 | } | 40 | } |
41 | *p = '\0'; | 41 | *p = '\0'; |
42 | return p; | 42 | return p; |