version 1.167, 2003/04/23 11:00:14
|
version 1.168, 2003/07/25 14:16:20
|
Line 2214 char *MakeRelativeURL (char *aName,
|
Line 2214 char *MakeRelativeURL (char *aName,
|
/* Find extent of match */ |
/* Find extent of match */ |
if (*p == ':') |
if (*p == ':') |
{ |
{ |
after_access = p + 1; |
after_access = p + 1; |
if (len == 1) |
#ifdef _WINDOWS |
/* it's a local Windows path like c:... */ |
if (len == 1) |
slashes++; |
{ |
|
/* it's a local Windows path like c:... */ |
|
slashes+=2; |
|
} |
|
#endif /* _WINDOWS */ |
} |
} |
if (*p == DIR_SEP) |
if (*p == DIR_SEP) |
{ |
{ |
/* memorize the last slash position and count them */ |
/* memorize the last slash position and count them */ |
last_slash = p; |
last_slash = p; |
slashes++; |
slashes++; |
} |
} |
} |
} |
|
|
/* q, p point to the first non-matching character or zero */ |
/* q, p point to the first non-matching character or zero */ |
Line 2238 char *MakeRelativeURL (char *aName,
|
Line 2242 char *MakeRelativeURL (char *aName,
|
} |
} |
else if ((slashes < 2 && after_access == NULL) |
else if ((slashes < 2 && after_access == NULL) |
|| (slashes < 3 && after_access != NULL)) |
|| (slashes < 3 && after_access != NULL)) |
{ |
{ |
/* Two names whitout common path */ |
/* Two names whitout common path */ |
/* exactly the right length */ |
/* exactly the right length */ |
len = strlen (aName); |
len = strlen (aName); |
Line 2275 char *MakeRelativeURL (char *aName,
|
Line 2279 char *MakeRelativeURL (char *aName,
|
} |
} |
#ifdef _WINDOWS |
#ifdef _WINDOWS |
len = strlen (return_value); |
len = strlen (return_value); |
for (ndx = 0; ndx < len; ndx ++) |
for (ndx = 0; ndx < len; ndx ++) |
if (return_value[ndx] == '\\') |
if (return_value[ndx] == '\\') |
return_value[ndx] = '/' ; |
return_value[ndx] = '/' ; |
#endif /* _WINDOWS */ |
#endif /* _WINDOWS */ |