diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-06-12 05:06:38 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-06-12 05:06:38 +0000 |
| commit | 0f533621ffcdfe5841f437e2c5822f4e6d1364ed (patch) | |
| tree | 8d99ac0925a2ab98c79a48f58b14f20e63bc7695 /dmake | |
| parent | c8740da4a2f14bf52f764981b3f843b0b5b674a3 (diff) | |
INTEGRATION: CWS dmake48 (1.2.2); FILE MERGED
2007/01/30 02:39:45 vq 1.2.2.2: #i73996# Avoid relative paths going up to the root directory.
2007/01/21 23:21:12 vq 1.2.2.1: #i73661# Improve case insensitive directory caching on case sensitive
file systems but it is *not* recommended to to so. A comment was added
to the man page emphasizing this.
Diffstat (limited to 'dmake')
| -rw-r--r-- | dmake/path.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/dmake/path.c b/dmake/path.c index d49e40a90fbe..b37938f0dbdc 100644 --- a/dmake/path.c +++ b/dmake/path.c @@ -1,4 +1,4 @@ -/* RCS $Id: path.c,v 1.2 2007-01-18 09:31:57 vg Exp $ +/* RCS $Id: path.c,v 1.3 2007-06-12 06:06:38 obo Exp $ -- -- SYNOPSIS -- Pathname manipulation code @@ -44,7 +44,10 @@ char *name; PUBLIC char * -Basename(path) +Basename(path)/* +================ + Return pointer to the basename part of path. path itself remains + unchanged. */ char *path; { char *p; @@ -110,6 +113,8 @@ char *name; int dlen = 0; int len; + DB_ENTER( "Build_path" ); + if( dir != NIL(char) ) dlen = strlen( dir ); if( name != NIL(char) ) plen = strlen( name ); len = plen+dlen+1+1; /* Reserve space for extra path separator. */ @@ -137,10 +142,12 @@ char *name; } DB_PRINT( "path", ("dir: %s name: %s", dir, name )); + DB_PRINT( "path", ("joined to: %s", path )); Clean_path( path ); + DB_PRINT( "path", ("cleaned to: %s", path )); - return( path ); + DB_RETURN( path ); } |