gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor cleanups.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32031 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-02-10 10:52:54 +00:00
parent d5e9a52e35
commit a63d65764c
15 changed files with 137 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/NSURL.m
View file

@ -162,6 +162,7 @@ static char *unescape(const char *from, char * to);
*/
static char *buildURL(parsedURL *base, parsedURL *rel, BOOL standardize)
{
const char *rpath;
char *buf;
char *ptr;
char *tmp;
@ -189,8 +190,13 @@ static char *buildURL(parsedURL *base, parsedURL *rel, BOOL standardize)
}
if (rel->path != 0)
{
len += strlen(rel->path) + 1; // path
rpath = rel->path;
}
else
{
rpath = "";
}
len += strlen(rpath) + 1; // path
if (base != 0 && base->path != 0)
{
len += strlen(base->path) + 1; // path
@ -267,13 +273,13 @@ static char *buildURL(parsedURL *base, parsedURL *rel, BOOL standardize)
{
*tmp++ = '/';
}
strcpy(tmp, rel->path);
strcpy(tmp, rpath);
}
else if (base == 0)
{
strcpy(tmp, rel->path);
strcpy(tmp, rpath);
}
else if (rel->path[0] == 0)
else if (rpath[0] == 0)
{
if (base->hasNoPath == NO)
{
@ -293,7 +299,7 @@ static char *buildURL(parsedURL *base, parsedURL *rel, BOOL standardize)
tmp += (end - start);
}
*tmp++ = '/';
strcpy(tmp, rel->path);
strcpy(tmp, rpath);
}
if (standardize == YES)
@ -394,7 +400,6 @@ static char *buildURL(parsedURL *base, parsedURL *rel, BOOL standardize)
{
*ptr++ = '#';
strcpy(ptr, rel->fragment);
ptr = &ptr[strlen(ptr)];
}
return buf;