diff options
Diffstat (limited to 'mysys/mf_format.c')
| -rw-r--r-- | mysys/mf_format.c | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 7a861c9f1e6..6afa2938fa3 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -23,18 +23,19 @@ The arguments should be in unix format. */ -my_string fn_format(my_string to, const char *name, const char *dir, +char * fn_format(char * to, const char *name, const char *dir, const char *extension, uint flag) { - reg1 uint length; char dev[FN_REFLEN], buff[FN_REFLEN], *pos, *startpos; const char *ext; + reg1 size_t length; + size_t dev_length; DBUG_ENTER("fn_format"); DBUG_PRINT("enter",("name: %s dir: %s extension: %s flag: %d", name,dir,extension,flag)); /* Copy and skip directory */ - name+=(length=dirname_part(dev,(startpos=(my_string) name))); + name+=(length=dirname_part(dev, (startpos=(char *) name), &dev_length)); if (length == 0 || (flag & MY_REPLACE_DIR)) { /* Use given directory */ @@ -53,7 +54,8 @@ my_string fn_format(my_string to, const char *name, const char *dir, if (flag & MY_UNPACK_FILENAME) (void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */ - if ((pos= (char*) strchr(name,FN_EXTCHAR)) != NullS) + if (!(flag & MY_APPEND_EXT) && + (pos= (char*) strchr(name,FN_EXTCHAR)) != NullS) { if ((flag & MY_REPLACE_EXT) == 0) /* If we should keep old ext */ { @@ -62,7 +64,7 @@ my_string fn_format(my_string to, const char *name, const char *dir, } else { - length=(uint) (pos-(char*) name); /* Change extension */ + length= (size_t) (pos-(char*) name); /* Change extension */ ext= extension; } } @@ -75,18 +77,19 @@ my_string fn_format(my_string to, const char *name, const char *dir, if (strlen(dev)+length+strlen(ext) >= FN_REFLEN || length >= FN_LEN ) { /* To long path, return original or NULL */ - uint tmp_length; + size_t tmp_length; if (flag & MY_SAFE_PATH) - return NullS; - tmp_length=strlength(startpos); - DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %d",dev,ext,length)); + DBUG_RETURN(NullS); + tmp_length= strlength(startpos); + DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %u",dev,ext, + (uint) length)); (void) strmake(to,startpos,min(tmp_length,FN_REFLEN-1)); } else { if (to == startpos) { - bmove(buff,(char*) name,length); /* Save name for last copy */ + bmove(buff,(uchar*) name,length); /* Save name for last copy */ name=buff; } pos=strmake(strmov(to,dev),name,length); @@ -108,18 +111,18 @@ my_string fn_format(my_string to, const char *name, const char *dir, } /* fn_format */ - /* - strlength(const string str) - Return length of string with end-space:s not counted. - */ +/* + strlength(const string str) + Return length of string with end-space:s not counted. +*/ -size_s strlength(const char *str) +size_t strlength(const char *str) { - reg1 my_string pos; - reg2 my_string found; + reg1 const char * pos; + reg2 const char * found; DBUG_ENTER("strlength"); - pos=found=(char*) str; + pos= found= str; while (*pos) { @@ -135,5 +138,5 @@ size_s strlength(const char *str) found=pos; while (*++pos == ' ') {}; } - DBUG_RETURN((size_s) (found-(char*) str)); + DBUG_RETURN((size_t) (found - str)); } /* strlength */ |