diff options
| author | monty@donna.mysql.com <> | 2001-01-19 04:57:29 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-19 04:57:29 +0200 |
| commit | 038fe2fc5c8b9f3f41782e8194b37850095b4e5c (patch) | |
| tree | e6062d0caaa582f6d8fee0a4660b1e970681da48 /mysys/mf_format.c | |
| parent | ee3e0a983008931cd064364ee7b7e8a9c29073a9 (diff) | |
| download | mariadb-git-038fe2fc5c8b9f3f41782e8194b37850095b4e5c.tar.gz | |
Added MYSQL_SERVER_SUFFIX to mysqld
Fixed bug in TRIM
changed strnmov -> strmake
Diffstat (limited to 'mysys/mf_format.c')
| -rw-r--r-- | mysys/mf_format.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 3050fd88e90..bb784ff08fe 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -57,7 +57,7 @@ my_string fn_format(my_string to, const char *name, const char *dsk, name+=(length=dirname_part(dev,(startpos=(my_string) name))); if (length == 0 || flag & 1) { - (void) strnmov(dev,dsk, sizeof(dev) - 2); + (void) strmake(dev,dsk, sizeof(dev) - 2); /* Use given directory */ convert_dirname(dev); /* Fix to this OS */ } @@ -100,7 +100,7 @@ my_string fn_format(my_string to, const char *name, const char *dsk, bmove(buff,(char*) name,length); /* Save name for last copy */ name=buff; } - pos=strnmov(strmov(to,dev),name,length); + pos=strmake(strmov(to,dev),name,length); #ifdef FN_UPPER_CASE caseup_str(to); #endif @@ -117,7 +117,7 @@ my_string fn_format(my_string to, const char *name, const char *dsk, if (flag & 32 || (!lstat(to,&stat_buff) && S_ISLNK(stat_buff.st_mode))) { if (realpath(to,buff)) - strnmov(to,buff,FN_REFLEN-1); + strmake(to,buff,FN_REFLEN-1); } } #endif |