diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
| commit | 6b31e63177e0c16d92e460302bae9b2c92c8f500 (patch) | |
| tree | d206f4c8848a50899d8d0656e8c8212189365ace /mysys/mf_pack.c | |
| parent | f4e7c093726a0143fd734b588c10e2b7780fe9ab (diff) | |
| parent | 3251e4549c7541557546d0550ddfafa1574fe5ce (diff) | |
| download | mariadb-git-6b31e63177e0c16d92e460302bae9b2c92c8f500.tar.gz | |
5.1 -> 5.2 merge
Diffstat (limited to 'mysys/mf_pack.c')
| -rw-r--r-- | mysys/mf_pack.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index e6b576b6d96..4521216cdc7 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2012, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +12,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ #include "mysys_priv.h" #include <m_string.h> @@ -519,10 +521,10 @@ char *intern_filename(char *to, const char *from) char buff[FN_REFLEN + 1]; if (from == to) { /* Dirname may destroy from */ - strmov(buff,from); + (void) strnmov(buff, from, FN_REFLEN); from=buff; } length= dirname_part(to, from, &to_length); /* Copy dirname & fix chars */ - (void) strmov(to + to_length,from+length); + (void) strnmov(to + to_length, from + length, FN_REFLEN - to_length); return (to); } /* intern_filename */ |