diff options
author | Jeremy Allison <jra@samba.org> | 1998-09-28 21:43:48 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 1998-09-28 21:43:48 +0000 |
commit | cf3a9741dc7427efb97eff09a3c197a906ce6767 (patch) | |
tree | a5ca09216db91089dd5c2be34751733c4dbff2be /source3/smbd/filename.c | |
parent | cdaa53e3ef7e9bbb7dedaa82d54f730085b9250c (diff) | |
download | samba-cf3a9741dc7427efb97eff09a3c197a906ce6767.tar.gz samba-cf3a9741dc7427efb97eff09a3c197a906ce6767.tar.xz samba-cf3a9741dc7427efb97eff09a3c197a906ce6767.zip |
Changes to test in configure if capabilities are enabled on a system.
Changes to get Samba to compile cleanly with the IRIX compiler
with the options : -fullwarn -woff 1209,1174 (the -woff options
are to turn off warnings about unused function parameters and
controlling loop expressions being constants).
Split prototype generation as we hit a limit in IRIX nawk.
Removed "." code in smbd/filename.c (yet again :-).
Jeremy.
(This used to be commit e0567433bd72aec17bf5a54cc292701095d25f09)
Diffstat (limited to 'source3/smbd/filename.c')
-rw-r--r-- | source3/smbd/filename.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 7cbb3392cb7..ff4d6827477 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -332,7 +332,7 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, BOOL *bad_path, SMB_STRUCT_STAT *pst) { SMB_STRUCT_STAT st; - char *start, *end, *orig_start; + char *start, *end; pstring dirpath; pstring orig_path; int saved_errno; @@ -367,17 +367,6 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, trim_string(name,"/","/"); /* - * If we trimmed down to a single '\0' character - * then we should use the "." directory to avoid - * searching the cache. - */ - - if(!*name) { - name[0] = '.'; - name[1] = '\0'; - } - - /* * Ensure saved_last_component is valid even if file exists. */ @@ -413,6 +402,15 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, return(True); } + /* + * If we trimmed down to a single '\0' character + * then we will be using the "." directory. + * As we know this is valid we can return true here. + */ + + if(!*name) + return(True); + start = name; while (strncmp(start,"./",2) == 0) start += 2; @@ -479,7 +477,7 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component, * as is first, then trying to scan the directory for matching names. */ - for (orig_start = start; start ; start = (end?end+1:(char *)NULL)) { + for (; start ; start = (end?end+1:(char *)NULL)) { /* * Pinpoint the end of this section of the filename. */ |