From fcfc9de85ced28a37581b1b68f4e6ccececb6fb7 Mon Sep 17 00:00:00 2001 From: Nirbhay Choubey Date: Mon, 7 Jan 2013 16:16:08 +0530 Subject: Bug#16066243 PB2 FAILURES I_MAIN.BUG15912213 AND I_MAIN.CTYPE_UTF8 FOR MACOSX10.6 FOR 5.1 Part 2: Fix for test failures on Windows. --- mysys/mf_pack.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mysys/mf_pack.c') diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index 0f150fa063e..acfad8948d4 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 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 +11,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 @@ -519,10 +520,10 @@ char *intern_filename(char *to, const char *from) char buff[FN_REFLEN]; 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 */ -- cgit v1.2.1