diff options
| author | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
| commit | 17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf (patch) | |
| tree | ac2ca2aacd05cc4eb1bec0b1f8c909b9d64fa2e6 /mysys | |
| parent | dad1e2048d3ac1477557a2645ccd323143601723 (diff) | |
| parent | f577ebb88fc4f56f440ee3736b54512d528ca0a9 (diff) | |
| download | mariadb-git-17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_format.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 0fec9d27b1d..50f354df1cd 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -17,13 +17,12 @@ #include "mysys_priv.h" #include <m_string.h> - /* - Formats a filename with possible replace of directory of extension - Function can handle the case where 'to' == 'name' - For a description of the flag values, consult my_sys.h - The arguments should be in unix format. - */ - +/* + Formats a filename with possible replace of directory of extension + Function can handle the case where 'to' == 'name' + For a description of the flag values, consult my_sys.h + The arguments should be in unix format. +*/ my_string fn_format(my_string to, const char *name, const char *dir, const char *extension, uint flag) @@ -54,8 +53,7 @@ my_string fn_format(my_string to, const char *name, const char *dir, pack_dirname(dev,dev); /* Put in ./.. and ~/.. */ if (flag & MY_UNPACK_FILENAME) (void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */ - if (flag & MY_UNIX_PATH) - to_unix_path(dev); /* Fix to MySQL representation */ + if ((pos= (char*) strchr(name,FN_EXTCHAR)) != NullS) { if ((flag & MY_REPLACE_EXT) == 0) /* If we should keep old ext */ |