mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
156 lines
4.2 KiB
C
156 lines
4.2 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#ifdef HAVE_REALPATH
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
/* format a filename with replace of library and extension */
|
|
/* params to and name may be identicall */
|
|
/* function doesn't change name if name != to */
|
|
/* Flag may be: 1 replace filenames library with 'dsk' */
|
|
/* 2 replace extension with 'form' */
|
|
/* 4 Unpack filename (replace ~ with home) */
|
|
/* 8 Pack filename as short as possibly */
|
|
/* 16 Resolve symbolic links for filename */
|
|
/* 32 Resolve filename to full path */
|
|
/* 64 Return NULL if too long path */
|
|
|
|
#ifdef SCO
|
|
#define BUFF_LEN 4097
|
|
#else
|
|
#ifdef MAXPATHLEN
|
|
#define BUFF_LEN MAXPATHLEN
|
|
#else
|
|
#define BUFF_LEN FN_LEN
|
|
#endif
|
|
#endif
|
|
|
|
my_string fn_format(my_string to, const char *name, const char *dsk,
|
|
const char *form, int flag)
|
|
{
|
|
reg1 uint length;
|
|
char dev[FN_REFLEN], buff[BUFF_LEN], *pos, *startpos;
|
|
const char *ext;
|
|
DBUG_ENTER("fn_format");
|
|
DBUG_PRINT("enter",("name: %s dsk: %s form: %s flag: %d",
|
|
name,dsk,form,flag));
|
|
|
|
/* Kopiera & skippa enheten */
|
|
name+=(length=dirname_part(dev,(startpos=(my_string) name)));
|
|
if (length == 0 || flag & 1)
|
|
{
|
|
(void) strmake(dev,dsk, sizeof(dev) - 2);
|
|
/* Use given directory */
|
|
convert_dirname(dev); /* Fix to this OS */
|
|
}
|
|
if (flag & 8)
|
|
pack_dirname(dev,dev); /* Put in ./.. and ~/.. */
|
|
if (flag & 4)
|
|
(void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */
|
|
if ((pos=(char*)strchr(name,FN_EXTCHAR)) != NullS)
|
|
{
|
|
if ((flag & 2) == 0) /* Skall vi byta extension ? */
|
|
{
|
|
length=strlength(name); /* Old extension */
|
|
ext = "";
|
|
}
|
|
else
|
|
{
|
|
length=(uint) (pos-(char*) name); /* Change extension */
|
|
ext= form;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
length=strlength(name); /* Har ingen ext- tag nya */
|
|
ext=form;
|
|
}
|
|
|
|
if (strlen(dev)+length+strlen(ext) >= FN_REFLEN || length >= FN_LEN )
|
|
{ /* To long path, return original */
|
|
uint tmp_length;
|
|
if (flag & 64)
|
|
return 0;
|
|
tmp_length=strlength(startpos);
|
|
DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %d",dev,ext,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 */
|
|
name=buff;
|
|
}
|
|
pos=strmake(strmov(to,dev),name,length);
|
|
#ifdef FN_UPPER_CASE
|
|
caseup_str(to);
|
|
#endif
|
|
#ifdef FN_LOWER_CASE
|
|
casedn_str(to);
|
|
#endif
|
|
(void) strmov(pos,ext); /* Don't convert extension */
|
|
}
|
|
/* Purify gives a lot of UMR errors when using realpath */
|
|
#if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH)
|
|
if (flag & 16)
|
|
{
|
|
struct stat stat_buff;
|
|
if (flag & 32 || (!lstat(to,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
|
|
{
|
|
if (realpath(to,buff))
|
|
strmake(to,buff,FN_REFLEN-1);
|
|
}
|
|
}
|
|
#endif
|
|
DBUG_RETURN (to);
|
|
} /* fn_format */
|
|
|
|
|
|
/*
|
|
strlength(const string str)
|
|
Return length of string with end-space:s not counted.
|
|
*/
|
|
|
|
size_s strlength(const char *str)
|
|
{
|
|
reg1 my_string pos;
|
|
reg2 my_string found;
|
|
DBUG_ENTER("strlength");
|
|
|
|
pos=found=(char*) str;
|
|
|
|
while (*pos)
|
|
{
|
|
if (*pos != ' ')
|
|
{
|
|
while (*++pos && *pos != ' ') {};
|
|
if (!*pos)
|
|
{
|
|
found=pos; /* String ends here */
|
|
break;
|
|
}
|
|
}
|
|
found=pos;
|
|
while (*++pos == ' ') {};
|
|
}
|
|
DBUG_RETURN((size_s) (found-(char*) str));
|
|
} /* strlength */
|