boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-13 12:22:17 +00:00
Code Issues Projects Releases Wiki Activity

Don't reverse slash direction when reconstituting paths on NT

Browse Source 
[SVN r18368]
This commit is contained in:
Dave Abrahams
2003-05-08 13:30:24 +00:00
parent 09938be5b0
commit 8cbcbd861b
1 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/engine/pathunix.c
View File

@@ -134,8 +134,47 @@ path_parse(
f->f_base.len = end - file;
}
/*
* path_delims - the string of legal path delimiters
*/
static char path_delims[] = {
PATH_DELIM,
# if PATH_DELIM == '\\'
'/',
# endif
0
};
/*
* is_path_delim() - true iff c is a path delimiter
*/
static int is_path_delim( char c )
{
char* p = strchr( path_delims, c );
return p && *p;
}
/*
* as_path_delim() - convert c to a path delimiter if it isn't one
* already
*/
static char as_path_delim( char c )
{
return is_path_delim( c ) ? c : PATH_DELIM;
}
/*
* path_build() - build a filename given dir/base/suffix/member
*
* To avoid changing slash direction on NT when reconstituting paths,
* instead of unconditionally appending PATH_DELIM we check the
* past-the-end character of the previous path element. If it is in
* path_delims, we append that, and only append PATH_DELIM as a last
* resort. This relies on the assumption that all strings are zero
* terminated, so a past-the-end character will always be available.
*
* As an attendant patch, we had to ensure that backslashes are used
* explicitly in timestamp.c
*/
void
@@ -165,7 +204,7 @@ path_build(
{
string_append_range( file, f->f_root.ptr, f->f_root.ptr + f->f_root.len );
string_push_back( file, PATH_DELIM );
string_push_back( file, as_path_delim( f->f_root.ptr[f->f_root.len] ) );
}
if( f->f_dir.len )
@@ -184,8 +223,8 @@ path_build(
# if PATH_DELIM == '\\'
if( !( f->f_dir.len == 3 && f->f_dir.ptr[1] == ':' ) )
# endif
if( !( f->f_dir.len == 1 && f->f_dir.ptr[0] == PATH_DELIM ) )
string_push_back( file, PATH_DELIM );
if( !( f->f_dir.len == 1 && is_path_delim( f->f_dir.ptr[0] ) ) )
string_push_back( file, as_path_delim( f->f_dir.ptr[f->f_dir.len] ) );
}
if( f->f_base.len )