Unified · Split
| @@ -55,11 +55,11 @@ urlto(Url *url, char *u) · 54 unmodified lines | ||
| 55 | 55 | |
| 56 | 56 | /* relative, no scheme */ |
| 57 | 57 | len = strlen(url->url); |
| 58 | − if(url->url[len-1] == '/') /* easy */ | |
| 59 | − u = smprint("%s/%s%s", url->url, u, trail); | |
| 60 | − else{ | |
| 58 | + if(url->url[len-1] == '/'){ /* easy */ | |
| 59 | + u = smprint("%s%s%s", url->url, u, trail); | |
| 60 | + }else{ | |
| 61 | 61 | /* replace the last element */ |
| 62 | − if((e = strrchr(url->url, '/')) != nil) | |
| 62 | + if((e = strrchr(url->url, '/')) != nil && e[-1] != '/') | |
| 63 | 63 | len = e - url->url; |
| 64 | 64 | u = smprint("%.*s/%s%s", len, url->url, u, trail); |
| 65 | 65 | } |