mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
cfab46f546
Fixed memory leak on shutdown (Affects the embedded version & MyODBC) client/client_priv.h: Update copyright client/completion_hash.cc: Update copyright client/completion_hash.h: Update copyright client/connect_test.c: Update copyright client/errmsg.c: Update copyright client/get_password.c: Update copyright client/insert_test.c: Update copyright client/list_test.c: Update copyright client/my_readline.h: Update copyright client/mysql.cc: Update copyright client/mysqladmin.c: Update copyright client/mysqlbinlog.cc: Update copyright client/mysqlcheck.c: Update copyright client/mysqldump.c: Update copyright client/mysqlimport.c: Update copyright client/mysqlmanager-pwgen.c: Update copyright client/mysqlmanagerc.c: Update copyright client/mysqlshow.c: Update copyright client/mysqltest.c: Update copyright client/password.c: Update copyright client/readline.cc: Update copyright client/select_test.c: Update copyright client/showdb_test.c: Update copyright client/sql_string.cc: Update copyright client/sql_string.h: Update copyright client/ssl_test.c: Update copyright client/thimble.cc: Update copyright client/thread_test.c: Update copyright div/deadlock_test.c: Update copyright extra/comp_err.c: Update copyright extra/my_print_defaults.c: Update copyright extra/perror.c: Update copyright extra/replace.c: Update copyright extra/resolve_stack_dump.c: Update copyright extra/resolveip.c: Update copyright fs/database.c: Update copyright fs/libmysqlfs.c: Update copyright fs/mysqlcorbafs.c: Update copyright fs/mysqlcorbafs.h: Update copyright fs/mysqlcorbafs_test.c: Update copyright heap/_check.c: Update copyright heap/_rectest.c: Update copyright heap/heapdef.h: Update copyright heap/hp_block.c: Update copyright heap/hp_clear.c: Update copyright heap/hp_close.c: Update copyright heap/hp_create.c: Update copyright heap/hp_delete.c: Update copyright heap/hp_extra.c: Update copyright heap/hp_hash.c: Update copyright heap/hp_info.c: Update copyright heap/hp_open.c: Update copyright heap/hp_panic.c: Update copyright heap/hp_rename.c: Update copyright heap/hp_rfirst.c: Update copyright heap/hp_rkey.c: Update copyright heap/hp_rlast.c: Update copyright heap/hp_rnext.c: Update copyright heap/hp_rprev.c: Update copyright heap/hp_rrnd.c: Update copyright heap/hp_rsame.c: Update copyright heap/hp_scan.c: Update copyright heap/hp_static.c: Update copyright heap/hp_test1.c: Update copyright heap/hp_test2.c: Update copyright heap/hp_update.c: Update copyright heap/hp_write.c: Update copyright include/config-win.h: Update copyright include/dbug.h: Update copyright include/errmsg.h: Update copyright include/ft_global.h: Update copyright include/getopt.h: Update copyright include/hash.h: Update copyright include/heap.h: Update copyright include/m_ctype.h: Update copyright include/m_string.h: Update copyright include/md5.h: Update copyright include/merge.h: Update copyright include/my_alarm.h: Update copyright include/my_base.h: Update copyright include/my_bitmap.h: Update copyright include/my_dir.h: Update copyright include/my_global.h: Update copyright include/my_list.h: Update copyright include/my_net.h: Update copyright include/my_no_pthread.h: Update copyright include/my_nosys.h: Update copyright include/my_pthread.h: Update copyright include/my_sys.h: Update copyright include/my_tree.h: Update copyright include/myisam.h: Update copyright include/myisammrg.h: Update copyright include/myisampack.h: Update copyright include/mysql.h: Update copyright include/mysql_com.h: Update copyright include/mysql_embed.h: Update copyright include/mysqld_error.h: Update copyright include/mysys_err.h: Update copyright include/nisam.h: Update copyright include/queues.h: Update copyright include/raid.h: Update copyright include/sslopt-case.h: Update copyright include/sslopt-longopts.h: Update copyright include/sslopt-usage.h: Update copyright include/sslopt-vars.h: Update copyright include/t_ctype.h: Update copyright include/thr_alarm.h: Update copyright include/thr_lock.h: Update copyright include/violite.h: Update copyright isam/_cache.c: Update copyright isam/_dbug.c: Update copyright isam/_key.c: Update copyright isam/_locking.c: Update copyright isam/_packrec.c: Update copyright isam/_page.c: Update copyright isam/_search.c: Update copyright isam/_statrec.c: Update copyright isam/changed.c: Update copyright isam/close.c: Update copyright isam/create.c: Update copyright isam/delete.c: Update copyright isam/extra.c: Update copyright isam/info.c: Update copyright isam/isamchk.c: Update copyright isam/isamdef.h: Update copyright isam/log.c: Update copyright isam/open.c: Update copyright isam/panic.c: Update copyright isam/range.c: Update copyright isam/rfirst.c: Update copyright isam/rkey.c: Update copyright isam/rlast.c: Update copyright isam/rnext.c: Update copyright isam/rprev.c: Update copyright isam/rrnd.c: Update copyright isam/rsame.c: Update copyright isam/rsamepos.c: Update copyright isam/sort.c: Update copyright isam/static.c: Update copyright isam/test1.c: Update copyright isam/test2.c: Update copyright isam/test3.c: Update copyright isam/update.c: Update copyright isam/write.c: Update copyright libmysql/conf_to_src.c: Update copyright libmysql/dll.c: Update copyright libmysql/errmsg.c: Update copyright libmysql/get_password.c: Update copyright libmysql/libmysql.c: Update copyright libmysql/manager.c: Update copyright libmysql/net.c: Update copyright libmysql/password.c: Update copyright libmysqld/lib_sql.cc: Update copyright libmysqld/lib_vio.c: Update copyright libmysqld/libmysqld.c: Update copyright merge/mrg_close.c: Update copyright merge/mrg_create.c: Update copyright merge/mrg_def.h: Update copyright merge/mrg_delete.c: Update copyright merge/mrg_extra.c: Update copyright merge/mrg_info.c: Update copyright merge/mrg_locking.c: Update copyright merge/mrg_open.c: Update copyright merge/mrg_panic.c: Update copyright merge/mrg_rrnd.c: Update copyright merge/mrg_rsame.c: Update copyright merge/mrg_static.c: Update copyright merge/mrg_update.c: Update copyright myisam/ft_boolean_search.c: Update copyright myisam/ft_dump.c: Update copyright myisam/ft_eval.h: Update copyright myisam/ft_static.c: Update copyright myisam/ft_stem.c: Update copyright myisam/ft_stopwords.c: Update copyright myisam/ft_test1.h: Update copyright myisam/mi_cache.c: Update copyright myisam/mi_changed.c: Update copyright myisam/mi_check.c: Update copyright myisam/mi_checksum.c: Update copyright myisam/mi_close.c: Update copyright myisam/mi_create.c: Update copyright myisam/mi_dbug.c: Update copyright myisam/mi_delete.c: Update copyright myisam/mi_delete_all.c: Update copyright myisam/mi_delete_table.c: Update copyright myisam/mi_dynrec.c: Update copyright myisam/mi_extra.c: Update copyright myisam/mi_info.c: Update copyright myisam/mi_key.c: Update copyright myisam/mi_locking.c: Update copyright myisam/mi_log.c: Update copyright myisam/mi_open.c: Update copyright myisam/mi_packrec.c: Update copyright myisam/mi_page.c: Update copyright myisam/mi_panic.c: Update copyright myisam/mi_range.c: Update copyright myisam/mi_rename.c: Update copyright myisam/mi_rfirst.c: Update copyright myisam/mi_rlast.c: Update copyright myisam/mi_rnext_same.c: Update copyright myisam/mi_rrnd.c: Update copyright myisam/mi_rsame.c: Update copyright myisam/mi_rsamepos.c: Update copyright myisam/mi_scan.c: Update copyright myisam/mi_search.c: Update copyright myisam/mi_static.c: Update copyright myisam/mi_statrec.c: Update copyright myisam/mi_test1.c: Update copyright myisam/mi_test2.c: Update copyright myisam/mi_test3.c: Update copyright myisam/mi_unique.c: Update copyright myisam/mi_update.c: Update copyright myisam/mi_write.c: Update copyright myisam/myisamchk.c: Update copyright myisam/myisampack.c: Update copyright myisammrg/myrg_close.c: Update copyright myisammrg/myrg_create.c: Update copyright myisammrg/myrg_def.h: Update copyright myisammrg/myrg_delete.c: Update copyright myisammrg/myrg_locking.c: Update copyright myisammrg/myrg_open.c: Update copyright myisammrg/myrg_panic.c: Update copyright myisammrg/myrg_rsame.c: Update copyright myisammrg/myrg_static.c: Update copyright myisammrg/myrg_update.c: Update copyright myisammrg/myrg_write.c: Update copyright mysql-test/r/gcc296.result: Update of benchmark results mysql-test/r/innodb.result: Update of benchmark results mysql-test/r/join_outer.result: Update of benchmark results mysql-test/r/myisam.result: Update of benchmark results mysys/array.c: Update copyright mysys/charset.c: Fix for restart of character sets mysys/checksum.c: Update copyright mysys/default.c: Update copyright mysys/errors.c: Update copyright mysys/getopt.c: Cleanup mysys/getvar.c: Update copyright mysys/hash.c: Update copyright mysys/list.c: Update copyright mysys/make-conf.c: Update copyright mysys/md5.c: Update copyright mysys/mf_brkhant.c: Update copyright mysys/mf_cache.c: Update copyright mysys/mf_casecnv.c: Update copyright mysys/mf_dirname.c: Update copyright mysys/mf_fn_ext.c: Update copyright mysys/mf_format.c: Update copyright mysys/mf_getdate.c: Update copyright mysys/mf_iocache.c: Update copyright mysys/mf_iocache2.c: Update copyright mysys/mf_keycache.c: Update copyright mysys/mf_loadpath.c: Update copyright mysys/mf_pack.c: Update copyright mysys/mf_path.c: Update copyright mysys/mf_qsort.c: Update copyright mysys/mf_qsort2.c: Update copyright mysys/mf_radix.c: Update copyright mysys/mf_same.c: Update copyright mysys/mf_sleep.c: Update copyright mysys/mf_sort.c: Update copyright mysys/mf_soundex.c: Update copyright mysys/mf_stripp.c: Update copyright mysys/mf_tempfile.c: Update copyright mysys/mf_unixpath.c: Update copyright mysys/mf_util.c: Update copyright mysys/mf_wcomp.c: Update copyright mysys/mf_wfile.c: Update copyright mysys/mulalloc.c: Update copyright mysys/my_alarm.c: Update copyright mysys/my_alloc.c: Update copyright mysys/my_append.c: Update copyright mysys/my_bit.c: Update copyright mysys/my_bitmap.c: Update copyright mysys/my_chsize.c: Update copyright mysys/my_clock.c: Update copyright mysys/my_compress.c: Update copyright mysys/my_copy.c: Update copyright mysys/my_create.c: Update copyright mysys/my_delete.c: Update copyright mysys/my_div.c: Update copyright mysys/my_dup.c: Update copyright mysys/my_error.c: Update copyright mysys/my_fopen.c: Update copyright mysys/my_fstream.c: Update copyright mysys/my_getwd.c: Update copyright mysys/my_init.c: Free 'once_alloc' memory at shutdown. mysys/my_lib.c: Update copyright mysys/my_lock.c: Update copyright mysys/my_lockmem.c: Update copyright mysys/my_lread.c: Update copyright mysys/my_lwrite.c: Update copyright mysys/my_malloc.c: Update copyright mysys/my_messnc.c: Update copyright mysys/my_mkdir.c: Update copyright mysys/my_net.c: Update copyright mysys/my_once.c: Update copyright mysys/my_open.c: Update copyright mysys/my_pread.c: Update copyright mysys/my_pthread.c: Update copyright mysys/my_quick.c: Update copyright mysys/my_read.c: Update copyright mysys/my_realloc.c: Update copyright mysys/my_redel.c: Update copyright mysys/my_rename.c: Update copyright mysys/my_seek.c: Update copyright mysys/my_static.c: Update copyright mysys/my_static.h: Update copyright mysys/my_symlink.c: Update copyright mysys/my_symlink2.c: Update copyright mysys/my_tempnam.c: Update copyright mysys/my_thr_init.c: Update copyright mysys/my_vsnprintf.c: Update copyright mysys/my_wincond.c: Update copyright mysys/my_winthread.c: Update copyright mysys/my_write.c: Update copyright mysys/mysys_priv.h: Update copyright mysys/ptr_cmp.c: Update copyright mysys/queues.c: Update copyright mysys/raid.cc: Update copyright mysys/safemalloc.c: Update copyright mysys/string.c: Update copyright mysys/test_charset.c: Update copyright mysys/test_dir.c: Update copyright mysys/test_fn.c: Update copyright mysys/testhash.c: Update copyright mysys/thr_alarm.c: Update copyright mysys/thr_lock.c: Update copyright mysys/thr_mutex.c: Update copyright mysys/thr_rwlock.c: Update copyright mysys/tree.c: Update copyright mysys/typelib.c: Update copyright pstack/debug.c: Update copyright pstack/debug.h: Update copyright pstack/demangle.h: Update copyright pstack/ieee.c: Update copyright pstack/ieee.h: Update copyright pstack/pstack.c: Update copyright readline/bind.c: Cleanup empty lines readline/complete.c: Cleanup empty lines readline/display.c: Cleanup empty lines readline/funmap.c: Cleanup empty lines readline/histexpand.c: Cleanup empty lines readline/histfile.c: Cleanup empty lines readline/history.c: Cleanup empty lines readline/history.h: Cleanup empty lines readline/input.c: Cleanup empty lines readline/kill.c: Cleanup empty lines readline/readline.c: Cleanup empty lines readline/readline.h: Cleanup empty lines readline/vi_mode.c: Cleanup empty lines sql/cache_manager.cc: Update copyright sql/cache_manager.h: Update copyright sql/convert.cc: Update copyright sql/custom_conf.h: Update copyright sql/derror.cc: Update copyright sql/field.cc: Update copyright sql/field.h: Update copyright sql/field_conv.cc: Update copyright sql/filesort.cc: Update copyright sql/frm_crypt.cc: Update copyright sql/ha_berkeley.cc: Update copyright sql/ha_heap.cc: Update copyright sql/ha_heap.h: Update copyright sql/ha_innobase.cc: Update copyright sql/ha_isam.cc: Update copyright sql/ha_isam.h: Update copyright sql/ha_isammrg.cc: Update copyright sql/ha_isammrg.h: Update copyright sql/ha_myisam.cc: Update copyright sql/handler.cc: Update copyright sql/hash_filo.cc: Update copyright sql/hash_filo.h: Update copyright sql/hostname.cc: Update copyright sql/init.cc: Update copyright sql/item.cc: Update copyright sql/item.h: Update copyright sql/item_buff.cc: Update copyright sql/item_cmpfunc.cc: Update copyright sql/item_cmpfunc.h: Update copyright sql/item_create.cc: Update copyright sql/item_create.h: Update copyright sql/item_func.cc: Update copyright sql/item_strfunc.cc: Update copyright sql/item_sum.cc: Update copyright sql/item_sum.h: Update copyright sql/item_timefunc.cc: Update copyright sql/item_timefunc.h: Update copyright sql/item_uniq.cc: Update copyright sql/item_uniq.h: Update copyright sql/key.cc: Update copyright sql/lex_symbol.h: Update copyright sql/lock.cc: Update copyright sql/log.cc: Update copyright sql/log_event.cc: Update copyright sql/log_event.h: Update copyright sql/matherr.c: Update copyright sql/mf_iocache.cc: Update copyright sql/mini_client.cc: Update copyright sql/mini_client.h: Update copyright sql/my_lock.c: Update copyright sql/mysqld.cc: Update copyright sql/net_pkg.cc: Update copyright sql/net_serv.cc: Update copyright sql/opt_sum.cc: Update copyright sql/password.c: Update copyright sql/procedure.cc: Update copyright sql/procedure.h: Update copyright sql/records.cc: Update copyright sql/repl_failsafe.cc: Update copyright sql/slave.cc: Update copyright sql/slave.h: Update copyright sql/sql_acl.cc: Update copyright sql/sql_acl.h: Update copyright sql/sql_analyse.cc: Update copyright sql/sql_analyse.h: Update copyright sql/sql_base.cc: Update copyright sql/sql_cache.cc: Update copyright sql/sql_class.cc: Update copyright sql/sql_class.h: Update copyright sql/sql_crypt.cc: Update copyright sql/sql_crypt.h: Update copyright sql/sql_db.cc: Update copyright sql/sql_delete.cc: Update copyright sql/sql_handler.cc: Update copyright sql/sql_insert.cc: Update copyright sql/sql_lex.cc: Update copyright sql/sql_lex.h: Update copyright sql/sql_list.cc: Update copyright sql/sql_list.h: Update copyright sql/sql_load.cc: Update copyright sql/sql_map.cc: Update copyright sql/sql_map.h: Update copyright sql/sql_parse.cc: Update copyright sql/sql_rename.cc: Update copyright sql/sql_repl.cc: Update copyright sql/sql_select.h: Update copyright sql/sql_string.cc: Update copyright sql/sql_string.h: Update copyright sql/sql_table.cc: Update copyright sql/sql_test.cc: Update copyright sql/sql_udf.cc: Update copyright sql/sql_udf.h: Update copyright sql/stacktrace.c: Update copyright sql/structs.h: Update copyright sql/table.cc: Update copyright sql/table.h: Update copyright sql/thr_malloc.cc: Update copyright sql/time.cc: Update copyright sql/udf_example.cc: Update copyright sql/uniques.cc: Update copyright sql/unireg.cc: Update copyright sql/unireg.h: Update copyright strings/atof.c: Update copyright strings/bchange.c: Update copyright strings/bcmp.c: Update copyright strings/bcopy-duff.c: Update copyright strings/bfill.c: Update copyright strings/bmove.c: Update copyright strings/bmove512.c: Update copyright strings/bmove_upp.c: Update copyright strings/bzero.c: Update copyright strings/conf_to_src.c: Update copyright strings/ctype-big5.c: Update copyright strings/ctype-czech.c: Update copyright strings/ctype-euc_kr.c: Update copyright strings/ctype-gb2312.c: Update copyright strings/ctype-gbk.c: Update copyright strings/ctype-latin1_de.c: Update copyright strings/ctype-sjis.c: Update copyright strings/ctype-tis620.c: Update copyright strings/ctype-ujis.c: Update copyright strings/ctype.c: Update copyright strings/do_ctype.c: Update copyright strings/int2str.c: Update copyright strings/is_prefix.c: Update copyright strings/llstr.c: Update copyright strings/longlong2str.c: Update copyright strings/memcmp.c: Update copyright strings/memcpy.c: Update copyright strings/memset.c: Update copyright strings/r_strinstr.c: Update copyright strings/str2int.c: Update copyright strings/str_test.c: Update copyright strings/strappend.c: Update copyright strings/strcat.c: Update copyright strings/strcend.c: Update copyright strings/strchr.c: Update copyright strings/strcmp.c: Update copyright strings/strcont.c: Update copyright strings/strend.c: Update copyright strings/strfill.c: Update copyright strings/strings-not-used.h: Update copyright strings/strinstr.c: Update copyright strings/strlen.c: Update copyright strings/strmake.c: Update copyright strings/strmov.c: Update copyright strings/strnlen.c: Update copyright strings/strnmov.c: Update copyright strings/strrchr.c: Update copyright strings/strstr.c: Update copyright strings/strto.c: Update copyright strings/strtol.c: Update copyright strings/strtoll.c: Update copyright strings/strtoul.c: Update copyright strings/strtoull.c: Update copyright strings/strxmov.c: Update copyright strings/strxnmov.c: Update copyright strings/t_ctype.h: Update copyright strings/udiv.c: Update copyright tools/mysqlmanager.c: Update copyright vio/test-ssl.c: Update copyright vio/test-sslclient.c: Update copyright vio/test-sslserver.c: Update copyright vio/vio.c: Update copyright vio/viosocket.c: Update copyright vio/viossl.c: Update copyright vio/viosslfactories.c: Update copyright vio/viotest-ssl.c: Update copyright
530 lines
14 KiB
C
530 lines
14 KiB
C
/* Copyright (C) 2000 MySQL 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
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
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 */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif
|
|
#ifdef VMS
|
|
#include <rms.h>
|
|
#include <iodef.h>
|
|
#include <descrip.h>
|
|
#endif /* VMS */
|
|
|
|
static my_string NEAR_F expand_tilde(my_string *path);
|
|
|
|
/* Pack a dirname ; Changes HOME to ~/ and current dev to ./ */
|
|
/* from is a dirname (from dirname() ?) ending with FN_LIBCHAR */
|
|
/* to may be == from */
|
|
|
|
void pack_dirname(my_string to, const char *from)
|
|
{
|
|
int cwd_err;
|
|
uint d_length,length,buff_length;
|
|
my_string start;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("pack_dirname");
|
|
|
|
LINT_INIT(buff_length);
|
|
(void) intern_filename(to,from); /* Change to intern name */
|
|
|
|
#ifdef FN_DEVCHAR
|
|
if ((start=strrchr(to,FN_DEVCHAR)) != 0) /* Skipp device part */
|
|
start++;
|
|
else
|
|
#endif
|
|
start=to;
|
|
|
|
if (!(cwd_err= my_getwd(buff,FN_REFLEN,MYF(0))))
|
|
{
|
|
buff_length= (uint) strlen(buff);
|
|
d_length=(uint) (start-to);
|
|
if ((start == to ||
|
|
(buff_length == d_length && !bcmp(buff,start,d_length))) &&
|
|
*start != FN_LIBCHAR && *start)
|
|
{ /* Put current dir before */
|
|
bchange(to,d_length,buff,buff_length,(uint) strlen(to)+1);
|
|
}
|
|
}
|
|
|
|
if ((d_length= cleanup_dirname(to,to)) != 0)
|
|
{
|
|
length=0;
|
|
if (home_dir)
|
|
{
|
|
length= (uint) strlen(home_dir);
|
|
if (home_dir[length-1] == FN_LIBCHAR)
|
|
length--; /* Don't test last '/' */
|
|
}
|
|
if (length > 1 && length < d_length)
|
|
{ /* test if /xx/yy -> ~/yy */
|
|
if (bcmp(to,home_dir,length) == 0 && to[length] == FN_LIBCHAR)
|
|
{
|
|
to[0]=FN_HOMELIB; /* Filename begins with ~ */
|
|
(void) strmov_overlapp(to+1,to+length);
|
|
}
|
|
}
|
|
if (! cwd_err)
|
|
{ /* Test if cwd is ~/... */
|
|
if (length > 1 && length < buff_length)
|
|
{
|
|
if (bcmp(buff,home_dir,length) == 0 && buff[length] == FN_LIBCHAR)
|
|
{
|
|
buff[0]=FN_HOMELIB;
|
|
(void) strmov_overlapp(buff+1,buff+length);
|
|
}
|
|
}
|
|
if (is_prefix(to,buff))
|
|
{
|
|
length= (uint) strlen(buff);
|
|
if (to[length])
|
|
(void) strmov_overlapp(to,to+length); /* Remove everything before */
|
|
else
|
|
{
|
|
to[0]= FN_CURLIB; /* Put ./ instead of cwd */
|
|
to[1]= FN_LIBCHAR;
|
|
to[2]= '\0';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
DBUG_PRINT("exit",("to: '%s'",to));
|
|
DBUG_VOID_RETURN;
|
|
} /* pack_dirname */
|
|
|
|
|
|
/* remove unwanted chars from dirname */
|
|
/* if "/../" removes prev dir; "/~/" removes all before ~ */
|
|
/* "//" is same as "/", except on Win32 at start of a file */
|
|
/* "/./" is removed */
|
|
/* Unpacks home_dir if "~/.." used */
|
|
/* Unpacks current dir if if "./.." used */
|
|
|
|
uint cleanup_dirname(register my_string to, const char *from)
|
|
/* to may be == from */
|
|
|
|
{
|
|
reg5 uint length;
|
|
reg2 my_string pos;
|
|
reg3 my_string from_ptr;
|
|
reg4 my_string start;
|
|
char parent[5], /* for "FN_PARENTDIR" */
|
|
buff[FN_REFLEN+1],*end_parentdir;
|
|
DBUG_ENTER("cleanup_dirname");
|
|
DBUG_PRINT("enter",("from: '%s'",from));
|
|
|
|
start=buff;
|
|
from_ptr=(my_string) from;
|
|
#ifdef FN_DEVCHAR
|
|
if ((pos=strrchr(from_ptr,FN_DEVCHAR)) != 0)
|
|
{ /* Skipp device part */
|
|
length=(uint) (pos-from_ptr)+1;
|
|
start=strnmov(buff,from_ptr,length); from_ptr+=length;
|
|
}
|
|
#endif
|
|
|
|
parent[0]=FN_LIBCHAR;
|
|
length=(uint) (strmov(parent+1,FN_PARENTDIR)-parent);
|
|
for (pos=start ; (*pos= *from_ptr++) != 0 ; pos++)
|
|
{
|
|
if (*pos == '/')
|
|
*pos = FN_LIBCHAR;
|
|
if (*pos == FN_LIBCHAR)
|
|
{
|
|
if ((uint) (pos-start) > length && bcmp(pos-length,parent,length) == 0)
|
|
{ /* If .../../; skipp prev */
|
|
pos-=length;
|
|
if (pos != start)
|
|
{ /* not /../ */
|
|
pos--;
|
|
if (*pos == FN_HOMELIB && (pos == start || pos[-1] == FN_LIBCHAR))
|
|
{
|
|
if (!home_dir)
|
|
{
|
|
pos+=length+1; /* Don't unpack ~/.. */
|
|
continue;
|
|
}
|
|
pos=strmov(buff,home_dir)-1; /* Unpacks ~/.. */
|
|
if (*pos == FN_LIBCHAR)
|
|
pos--; /* home ended with '/' */
|
|
}
|
|
if (*pos == FN_CURLIB && (pos == start || pos[-1] == FN_LIBCHAR))
|
|
{
|
|
if (my_getwd(curr_dir,FN_REFLEN,MYF(0)))
|
|
{
|
|
pos+=length+1; /* Don't unpack ./.. */
|
|
continue;
|
|
}
|
|
pos=strmov(buff,curr_dir)-1; /* Unpacks ./.. */
|
|
if (*pos == FN_LIBCHAR)
|
|
pos--; /* home ended with '/' */
|
|
}
|
|
end_parentdir=pos;
|
|
while (pos >= start && *pos != FN_LIBCHAR) /* remove prev dir */
|
|
pos--;
|
|
if (pos[1] == FN_HOMELIB || bcmp(pos,parent,length) == 0)
|
|
{ /* Don't remove ~user/ */
|
|
pos=strmov(end_parentdir+1,parent);
|
|
*pos=FN_LIBCHAR;
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
else if ((uint) (pos-start) == length-1 &&
|
|
!bcmp(start,parent+1,length-1))
|
|
start=pos; /* Starts with "../" */
|
|
else if (pos-start > 0 && pos[-1] == FN_LIBCHAR)
|
|
{
|
|
#ifdef FN_NETWORK_DRIVES
|
|
if (pos-start != 1)
|
|
#endif
|
|
pos--; /* Remove dupplicate '/' */
|
|
}
|
|
else if (pos-start > 1 && pos[-1] == FN_CURLIB && pos[-2] == FN_LIBCHAR)
|
|
pos-=2; /* Skipp /./ */
|
|
else if (pos > buff+1 && pos[-1] == FN_HOMELIB && pos[-2] == FN_LIBCHAR)
|
|
{ /* Found ..../~/ */
|
|
buff[0]=FN_HOMELIB;
|
|
buff[1]=FN_LIBCHAR;
|
|
start=buff; pos=buff+1;
|
|
}
|
|
}
|
|
}
|
|
(void) strmov(to,buff);
|
|
DBUG_PRINT("exit",("to: '%s'",to));
|
|
DBUG_RETURN((uint) (pos-buff));
|
|
} /* cleanup_dirname */
|
|
|
|
|
|
/*
|
|
On system where you don't have symbolic links, the following
|
|
code will allow you to create a file:
|
|
directory-name.lnk that should contain the real path
|
|
to the directory. This will be used if the directory name
|
|
doesn't exists
|
|
*/
|
|
|
|
|
|
my_bool my_use_symdir=0; /* Set this if you want to use symdirs */
|
|
|
|
#ifdef USE_SYMDIR
|
|
void symdirget(char *dir)
|
|
{
|
|
char buff[FN_REFLEN];
|
|
char *pos=strend(dir);
|
|
if (dir[0] && pos[-1] != FN_DEVCHAR && access(dir, F_OK))
|
|
{
|
|
FILE *fp;
|
|
char temp= *(--pos); /* May be "/" or "\" */
|
|
strmov(pos,".sym");
|
|
fp = my_fopen(dir, O_RDONLY,MYF(0));
|
|
*pos++=temp; *pos=0; /* Restore old filename */
|
|
if (fp)
|
|
{
|
|
if (fgets(buff, sizeof(buff)-1, fp))
|
|
{
|
|
for (pos=strend(buff);
|
|
pos > buff && (iscntrl(pos[-1]) || isspace(pos[-1])) ;
|
|
pos --);
|
|
|
|
/* Ensure that the symlink ends with the directory symbol */
|
|
if (pos == buff || pos[-1] != FN_LIBCHAR)
|
|
*pos++=FN_LIBCHAR;
|
|
|
|
strmake(dir,buff, (uint) (pos-buff));
|
|
}
|
|
my_fclose(fp,MYF(0));
|
|
}
|
|
}
|
|
}
|
|
#endif /* USE_SYMDIR */
|
|
|
|
/* Unpacks dirname to name that can be used by open... */
|
|
/* Make that last char of to is '/' if from not empty and
|
|
from doesn't end in FN_DEVCHAR */
|
|
/* Uses cleanup_dirname and changes ~/.. to home_dir/.. */
|
|
/* Returns length of new directory */
|
|
|
|
uint unpack_dirname(my_string to, const char *from)
|
|
|
|
/* to may be == from */
|
|
{
|
|
uint length,h_length;
|
|
char buff[FN_REFLEN+1+4],*suffix,*tilde_expansion;
|
|
DBUG_ENTER("unpack_dirname");
|
|
|
|
(void) intern_filename(buff,from); /* Change to intern name */
|
|
length= (uint) strlen(buff); /* Fix that '/' is last */
|
|
if (length &&
|
|
#ifdef FN_DEVCHAR
|
|
buff[length-1] != FN_DEVCHAR &&
|
|
#endif
|
|
buff[length-1] != FN_LIBCHAR && buff[length-1] != '/')
|
|
{
|
|
buff[length]=FN_LIBCHAR;
|
|
buff[length+1]= '\0';
|
|
}
|
|
|
|
length=cleanup_dirname(buff,buff);
|
|
if (buff[0] == FN_HOMELIB)
|
|
{
|
|
suffix=buff+1; tilde_expansion=expand_tilde(&suffix);
|
|
if (tilde_expansion)
|
|
{
|
|
length-=(uint) (suffix-buff)-1;
|
|
if (length+(h_length= (uint) strlen(tilde_expansion)) <= FN_REFLEN)
|
|
{
|
|
if (tilde_expansion[h_length-1] == FN_LIBCHAR)
|
|
h_length--;
|
|
if (buff+h_length < suffix)
|
|
bmove(buff+h_length,suffix,length);
|
|
else
|
|
bmove_upp(buff+h_length+length,suffix+length,length);
|
|
bmove(buff,tilde_expansion,h_length);
|
|
}
|
|
}
|
|
}
|
|
#ifdef USE_SYMDIR
|
|
if (my_use_symdir)
|
|
symdirget(buff);
|
|
#endif
|
|
DBUG_RETURN(system_filename(to,buff)); /* Fix for open */
|
|
} /* unpack_dirname */
|
|
|
|
|
|
/* Expand tilde to home or user-directory */
|
|
/* Path is reset to point at FN_LIBCHAR after ~xxx */
|
|
|
|
static my_string NEAR_F expand_tilde(my_string *path)
|
|
{
|
|
if (path[0][0] == FN_LIBCHAR)
|
|
return home_dir; /* ~/ expanded to home */
|
|
#ifdef HAVE_GETPWNAM
|
|
{
|
|
char *str,save;
|
|
struct passwd *user_entry;
|
|
|
|
if (!(str=strchr(*path,FN_LIBCHAR)))
|
|
str=strend(*path);
|
|
save= *str; *str= '\0';
|
|
user_entry=getpwnam(*path);
|
|
*str=save;
|
|
endpwent();
|
|
if (user_entry)
|
|
{
|
|
*path=str;
|
|
return user_entry->pw_dir;
|
|
}
|
|
}
|
|
#endif
|
|
return (my_string) 0;
|
|
}
|
|
|
|
/* fix filename so it can be used by open, create .. */
|
|
/* to may be == from */
|
|
/* Returns to */
|
|
|
|
my_string unpack_filename(my_string to, const char *from)
|
|
{
|
|
uint length,n_length;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("unpack_filename");
|
|
|
|
length=dirname_part(buff,from); /* copy & convert dirname */
|
|
n_length=unpack_dirname(buff,buff);
|
|
if (n_length+strlen(from+length) < FN_REFLEN)
|
|
{
|
|
(void) strmov(buff+n_length,from+length);
|
|
(void) system_filename(to,buff); /* Fix to usably filename */
|
|
}
|
|
else
|
|
(void) system_filename(to,from); /* Fix to usably filename */
|
|
DBUG_RETURN(to);
|
|
} /* unpack_filename */
|
|
|
|
|
|
/* Convert filename (unix standard) to system standard */
|
|
/* Used before system command's like open(), create() .. */
|
|
/* Returns to */
|
|
|
|
uint system_filename(my_string to, const char *from)
|
|
{
|
|
#ifndef FN_C_BEFORE_DIR
|
|
return (uint) (strmake(to,from,FN_REFLEN-1)-to);
|
|
#else /* VMS */
|
|
|
|
/* change 'dev:lib/xxx' to 'dev:[lib]xxx' */
|
|
/* change 'dev:xxx' to 'dev:xxx' */
|
|
/* change './xxx' to 'xxx' */
|
|
/* change './lib/' or lib/ to '[.lib]' */
|
|
/* change '/x/y/z to '[x.y]x' */
|
|
/* change 'dev:/x' to 'dev:[000000]x' */
|
|
|
|
int libchar_found,length;
|
|
my_string to_pos,from_pos,pos;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("system_filename");
|
|
|
|
libchar_found=0;
|
|
(void) strmov(buff,from); /* If to == from */
|
|
from_pos= buff;
|
|
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skipp device part */
|
|
{
|
|
pos++;
|
|
to_pos=strnmov(to,from_pos,(size_s) (pos-from_pos));
|
|
from_pos=pos;
|
|
}
|
|
else
|
|
to_pos=to;
|
|
|
|
if (from_pos[0] == FN_CURLIB && from_pos[1] == FN_LIBCHAR)
|
|
from_pos+=2; /* Skipp './' */
|
|
if (strchr(from_pos,FN_LIBCHAR))
|
|
{
|
|
*(to_pos++) = FN_C_BEFORE_DIR;
|
|
if (strinstr(from_pos,FN_ROOTDIR) == 1)
|
|
{
|
|
from_pos+=strlen(FN_ROOTDIR); /* Actually +1 but... */
|
|
if (! strchr(from_pos,FN_LIBCHAR))
|
|
{ /* No dir, use [000000] */
|
|
to_pos=strmov(to_pos,FN_C_ROOT_DIR);
|
|
libchar_found++;
|
|
}
|
|
}
|
|
else
|
|
*(to_pos++)=FN_C_DIR_SEP; /* '.' gives current dir */
|
|
|
|
while ((pos=strchr(from_pos,FN_LIBCHAR)))
|
|
{
|
|
if (libchar_found++)
|
|
*(to_pos++)=FN_C_DIR_SEP; /* Add '.' between dirs */
|
|
if (strinstr(from_pos,FN_PARENTDIR) == 1 &&
|
|
from_pos+strlen(FN_PARENTDIR) == pos)
|
|
to_pos=strmov(to_pos,FN_C_PARENT_DIR); /* Found '../' */
|
|
else
|
|
to_pos=strnmov(to_pos,from_pos,(size_s) (pos-from_pos));
|
|
from_pos=pos+1;
|
|
}
|
|
*(to_pos++)=FN_C_AFTER_DIR;
|
|
}
|
|
length=(int) (strmov(to_pos,from_pos)-to);
|
|
DBUG_PRINT("exit",("name: '%s'",to));
|
|
DBUG_RETURN((uint) length);
|
|
#endif
|
|
} /* system_filename */
|
|
|
|
|
|
/* Fix a filename to intern (UNIX format) */
|
|
|
|
my_string intern_filename(my_string to, const char *from)
|
|
{
|
|
#ifndef VMS
|
|
{
|
|
uint length;
|
|
char buff[FN_REFLEN];
|
|
if (from == to)
|
|
{ /* Dirname may destroy from */
|
|
strmov(buff,from);
|
|
from=buff;
|
|
}
|
|
length=dirname_part(to,from); /* Copy dirname & fix chars */
|
|
(void) strcat(to,from+length);
|
|
return (to);
|
|
}
|
|
#else /* VMS */
|
|
|
|
/* change 'dev:[lib]xxx' to 'dev:lib/xxx' */
|
|
/* change 'dev:xxx' to 'dev:xxx' */
|
|
/* change 'dev:x/y/[.lib]' to 'dev:x/y/lib/ */
|
|
/* change '[.lib]' to './lib/' */
|
|
/* change '[x.y]' or '[x.][y]' or '[x][.y]' to '/x/y/' */
|
|
/* change '[000000.x] or [x.000000]' to '/x/' */
|
|
|
|
int par_length,root_length;
|
|
my_string pos,from_pos,to_pos,end_pos;
|
|
char buff[FN_REFLEN];
|
|
|
|
convert_dirname(buff,from,NullS); /* change '<>' to '[]' */
|
|
from_pos=buff;
|
|
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skipp device part */
|
|
{
|
|
pos++;
|
|
to_pos=strnmov(to,from_pos,(size_s) (pos-from_pos));
|
|
from_pos=pos;
|
|
}
|
|
else
|
|
to_pos=to;
|
|
|
|
root_length=strlen(FN_C_ROOT_DIR);
|
|
if ((pos = strchr(from_pos,FN_C_BEFORE_DIR)) &&
|
|
(end_pos = strrchr(pos+1,FN_C_AFTER_DIR)))
|
|
{
|
|
to_pos=strnmov(to_pos,from_pos,(size_s) (pos-from_pos));
|
|
/* Copy all between ':' and '[' */
|
|
from_pos=pos+1;
|
|
if (strinstr(from_pos,FN_C_ROOT_DIR) == 1 &&
|
|
(from_pos[root_length] == FN_C_DIR_SEP ||
|
|
from_pos[root_length] == FN_C_AFTER_DIR))
|
|
{
|
|
from_pos+=root_length+1;
|
|
}
|
|
else if (*from_pos == FN_C_DIR_SEP)
|
|
*(to_pos++) = FN_CURLIB; /* Set ./ first */
|
|
*(to_pos++) = FN_LIBCHAR;
|
|
|
|
par_length=strlen(FN_C_PARENT_DIR);
|
|
pos=to_pos;
|
|
for (; from_pos <= end_pos ; from_pos++)
|
|
{
|
|
switch (*from_pos) {
|
|
case FN_C_DIR_SEP:
|
|
case FN_C_AFTER_DIR:
|
|
if (pos != to_pos)
|
|
{
|
|
if ((int) (to_pos-pos) == root_length &&
|
|
is_suffix(pos,FN_C_ROOT_DIR))
|
|
to_pos=pos; /* remove root-pos */
|
|
else
|
|
{
|
|
*(to_pos++)=FN_LIBCHAR; /* Find lib */
|
|
pos=to_pos;
|
|
}
|
|
}
|
|
break;
|
|
case FN_C_BEFORE_DIR:
|
|
break;
|
|
case '-': /* *(FN_C_PARENT_DIR): */
|
|
if (to_pos[-1] == FN_LIBCHAR &&
|
|
strncmp(from_pos,FN_C_PARENT_DIR,par_length) == 0)
|
|
{ /* Change '-' to '..' */
|
|
to_pos=strmov(to_pos,FN_PARENTDIR);
|
|
*(to_pos++)=FN_LIBCHAR;
|
|
pos=to_pos;
|
|
from_pos+=par_length-1;
|
|
break;
|
|
}
|
|
/* Fall through */
|
|
default:
|
|
*(to_pos++)= *from_pos;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
(void) strmov(to_pos,from_pos);
|
|
return (to);
|
|
#endif /* VMS */
|
|
} /* intern_filename */
|