mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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
618 lines
17 KiB
C
618 lines
17 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 */
|
|
|
|
/* TODO: check for overun of memory for names. */
|
|
/* Convert MSDOS-TIME to standar time_t */
|
|
|
|
#define USES_TYPES /* sys/types is included */
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include <my_dir.h> /* Structs used by my_dir,includes sys/types */
|
|
#include "mysys_err.h"
|
|
#if defined(HAVE_DIRENT_H)
|
|
# include <dirent.h>
|
|
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
|
#else
|
|
#ifndef OS2
|
|
# define dirent direct
|
|
#endif
|
|
# define NAMLEN(dirent) (dirent)->d_namlen
|
|
# if defined(HAVE_SYS_NDIR_H)
|
|
# include <sys/ndir.h>
|
|
# endif
|
|
# if defined(HAVE_SYS_DIR_H)
|
|
# include <sys/dir.h>
|
|
# endif
|
|
# if defined(HAVE_NDIR_H)
|
|
# include <ndir.h>
|
|
# endif
|
|
# if defined(MSDOS) || defined(__WIN__)
|
|
# include <dos.h>
|
|
# ifdef __BORLANDC__
|
|
# include <dir.h>
|
|
# endif
|
|
# endif
|
|
#endif
|
|
#ifdef VMS
|
|
#include <rms.h>
|
|
#include <iodef.h>
|
|
#include <descrip.h>
|
|
#endif
|
|
|
|
#ifdef OS2
|
|
#include "my_os2dirsrch.h"
|
|
#endif
|
|
|
|
#if defined(THREAD) && defined(HAVE_READDIR_R)
|
|
#define READDIR(A,B,C) ((errno=readdir_r(A,B,&C)) != 0 || !C)
|
|
#else
|
|
#define READDIR(A,B,C) (!(C=readdir(A)))
|
|
#endif
|
|
|
|
|
|
#define STARTSIZE ONCE_ALLOC_INIT*8 /* some mallocmargin */
|
|
|
|
static int comp_names(struct fileinfo *a,struct fileinfo *b);
|
|
|
|
|
|
/* We need this because program don't know with malloc we used */
|
|
|
|
void my_dirend(MY_DIR *buffer)
|
|
{
|
|
DBUG_ENTER("my_dirend");
|
|
if (buffer)
|
|
my_free((gptr) buffer,MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
} /* my_dirend */
|
|
|
|
|
|
/* Compare in sort of filenames */
|
|
|
|
static int comp_names(struct fileinfo *a, struct fileinfo *b)
|
|
{
|
|
return (strcmp(a->name,b->name));
|
|
} /* comp_names */
|
|
|
|
|
|
#if !defined(MSDOS) && !defined(__WIN__)
|
|
|
|
MY_DIR *my_dir(const char *path, myf MyFlags)
|
|
{
|
|
DIR *dirp;
|
|
struct dirent *dp;
|
|
struct fileinfo *fnames;
|
|
char *buffer, *obuffer, *tempptr;
|
|
uint fcnt,i,size,firstfcnt, maxfcnt,length;
|
|
char tmp_path[FN_REFLEN+1],*tmp_file;
|
|
my_ptrdiff_t diff;
|
|
bool eof;
|
|
#ifdef THREAD
|
|
char dirent_tmp[sizeof(struct dirent)+_POSIX_PATH_MAX+1];
|
|
#endif
|
|
DBUG_ENTER("my_dir");
|
|
DBUG_PRINT("my",("path: '%s' stat: %d MyFlags: %d",path,MyFlags));
|
|
|
|
#if defined(THREAD) && !defined(HAVE_READDIR_R)
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
#endif
|
|
|
|
dirp = opendir(directory_file_name(tmp_path,(my_string) path));
|
|
size = STARTSIZE;
|
|
#if defined(__amiga__)
|
|
if ((dirp->dd_fd) < 0) /* Directory doesn't exists */
|
|
goto error;
|
|
#endif
|
|
if (dirp == NULL || ! (buffer = (char *) my_malloc(size, MyFlags)))
|
|
goto error;
|
|
|
|
fcnt = 0;
|
|
tmp_file=strend(tmp_path);
|
|
firstfcnt = maxfcnt = (size - sizeof(MY_DIR)) /
|
|
(sizeof(struct fileinfo) + FN_LEN);
|
|
fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR));
|
|
tempptr = (char *) (fnames + maxfcnt);
|
|
|
|
#ifdef THREAD
|
|
dp= (struct dirent*) dirent_tmp;
|
|
#else
|
|
dp=0;
|
|
#endif
|
|
eof=0;
|
|
for (;;)
|
|
{
|
|
while (fcnt < maxfcnt &&
|
|
!(eof= READDIR(dirp,(struct dirent*) dirent_tmp,dp)))
|
|
{
|
|
bzero((gptr) (fnames+fcnt),sizeof(fnames[0])); /* for purify */
|
|
fnames[fcnt].name = tempptr;
|
|
tempptr = strmov(tempptr,dp->d_name) + 1;
|
|
if (MyFlags & MY_WANT_STAT)
|
|
{
|
|
VOID(strmov(tmp_file,dp->d_name));
|
|
VOID(my_stat(tmp_path, &fnames[fcnt].mystat, MyFlags));
|
|
}
|
|
++fcnt;
|
|
}
|
|
if (eof)
|
|
break;
|
|
size += STARTSIZE; obuffer = buffer;
|
|
if (!(buffer = (char *) my_realloc((gptr) buffer, size,
|
|
MyFlags | MY_FREE_ON_ERROR)))
|
|
goto error; /* No memory */
|
|
length= (uint) (sizeof(struct fileinfo ) * firstfcnt);
|
|
diff= PTR_BYTE_DIFF(buffer , obuffer) + (int) length;
|
|
fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR));
|
|
tempptr= ADD_TO_PTR(tempptr,diff,char*);
|
|
for (i = 0; i < maxfcnt; i++)
|
|
fnames[i].name = ADD_TO_PTR(fnames[i].name,diff,char*);
|
|
|
|
/* move filenames upp a bit */
|
|
maxfcnt += firstfcnt;
|
|
bmove_upp(tempptr,tempptr-length,
|
|
(uint) (tempptr- (char*) (fnames+maxfcnt)));
|
|
}
|
|
|
|
(void) closedir(dirp);
|
|
{
|
|
MY_DIR * s = (MY_DIR *) buffer;
|
|
s->number_off_files = (uint) fcnt;
|
|
s->dir_entry = fnames;
|
|
}
|
|
if (!(MyFlags & MY_DONT_SORT))
|
|
qsort((void *) fnames, (size_s) fcnt, sizeof(struct fileinfo),
|
|
(qsort_cmp) comp_names);
|
|
#if defined(THREAD) && !defined(HAVE_READDIR_R)
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
#endif
|
|
DBUG_RETURN((MY_DIR *) buffer);
|
|
|
|
error:
|
|
#if defined(THREAD) && !defined(HAVE_READDIR_R)
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
#endif
|
|
my_errno=errno;
|
|
if (dirp)
|
|
(void) closedir(dirp);
|
|
if (MyFlags & (MY_FAE | MY_WME))
|
|
my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,my_errno);
|
|
DBUG_RETURN((MY_DIR *) NULL);
|
|
} /* my_dir */
|
|
|
|
|
|
/*
|
|
* Convert from directory name to filename.
|
|
* On VMS:
|
|
* xyzzy:[mukesh.emacs] => xyzzy:[mukesh]emacs.dir.1
|
|
* xyzzy:[mukesh] => xyzzy:[000000]mukesh.dir.1
|
|
* On UNIX, it's simple: just make sure there is a terminating /
|
|
|
|
* Returns pointer to dst;
|
|
*/
|
|
|
|
my_string directory_file_name (my_string dst, const char *src)
|
|
{
|
|
#ifndef VMS
|
|
|
|
/* Process as Unix format: just remove test the final slash. */
|
|
|
|
my_string end;
|
|
|
|
if (src[0] == 0)
|
|
src= (char*) "."; /* Use empty as current */
|
|
end=strmov(dst, src);
|
|
if (end[-1] != FN_LIBCHAR)
|
|
{
|
|
end[0]=FN_LIBCHAR; /* Add last '/' */
|
|
end[1]='\0';
|
|
}
|
|
return dst;
|
|
|
|
#else /* VMS */
|
|
|
|
long slen;
|
|
long rlen;
|
|
my_string ptr, rptr;
|
|
char bracket;
|
|
struct FAB fab = cc$rms_fab;
|
|
struct NAM nam = cc$rms_nam;
|
|
char esa[NAM$C_MAXRSS];
|
|
|
|
if (! src[0])
|
|
src="[.]"; /* Empty is == current dir */
|
|
|
|
slen = strlen (src) - 1;
|
|
if (src[slen] == FN_C_AFTER_DIR || src[slen] == FN_C_AFTER_DIR_2 ||
|
|
src[slen] == FN_DEVCHAR)
|
|
{
|
|
/* VMS style - convert [x.y.z] to [x.y]z, [x] to [000000]x */
|
|
fab.fab$l_fna = src;
|
|
fab.fab$b_fns = slen + 1;
|
|
fab.fab$l_nam = &nam;
|
|
fab.fab$l_fop = FAB$M_NAM;
|
|
|
|
nam.nam$l_esa = esa;
|
|
nam.nam$b_ess = sizeof esa;
|
|
nam.nam$b_nop |= NAM$M_SYNCHK;
|
|
|
|
/* We call SYS$PARSE to handle such things as [--] for us. */
|
|
if (SYS$PARSE(&fab, 0, 0) == RMS$_NORMAL)
|
|
{
|
|
slen = nam.nam$b_esl - 1;
|
|
if (esa[slen] == ';' && esa[slen - 1] == '.')
|
|
slen -= 2;
|
|
esa[slen + 1] = '\0';
|
|
src = esa;
|
|
}
|
|
if (src[slen] != FN_C_AFTER_DIR && src[slen] != FN_C_AFTER_DIR_2)
|
|
{
|
|
/* what about when we have logical_name:???? */
|
|
if (src[slen] == FN_DEVCHAR)
|
|
{ /* Xlate logical name and see what we get */
|
|
VOID(strmov(dst,src));
|
|
dst[slen] = 0; /* remove colon */
|
|
if (!(src = getenv (dst)))
|
|
return dst; /* Can't translate */
|
|
|
|
/* should we jump to the beginning of this procedure?
|
|
Good points: allows us to use logical names that xlate
|
|
to Unix names,
|
|
Bad points: can be a problem if we just translated to a device
|
|
name...
|
|
For now, I'll punt and always expect VMS names, and hope for
|
|
the best! */
|
|
|
|
slen = strlen (src) - 1;
|
|
if (src[slen] != FN_C_AFTER_DIR && src[slen] != FN_C_AFTER_DIR_2)
|
|
{ /* no recursion here! */
|
|
VOID(strmov(dst, src));
|
|
return(dst);
|
|
}
|
|
}
|
|
else
|
|
{ /* not a directory spec */
|
|
VOID(strmov(dst, src));
|
|
return(dst);
|
|
}
|
|
}
|
|
|
|
bracket = src[slen]; /* End char */
|
|
if (!(ptr = strchr (src, bracket - 2)))
|
|
{ /* no opening bracket */
|
|
VOID(strmov (dst, src));
|
|
return dst;
|
|
}
|
|
if (!(rptr = strrchr (src, '.')))
|
|
rptr = ptr;
|
|
slen = rptr - src;
|
|
VOID(strmake (dst, src, slen));
|
|
|
|
if (*rptr == '.')
|
|
{ /* Put bracket and add */
|
|
dst[slen++] = bracket; /* (rptr+1) after this */
|
|
}
|
|
else
|
|
{
|
|
/* If we have the top-level of a rooted directory (i.e. xx:[000000]),
|
|
then translate the device and recurse. */
|
|
|
|
if (dst[slen - 1] == ':'
|
|
&& dst[slen - 2] != ':' /* skip decnet nodes */
|
|
&& strcmp(src + slen, "[000000]") == 0)
|
|
{
|
|
dst[slen - 1] = '\0';
|
|
if ((ptr = getenv (dst))
|
|
&& (rlen = strlen (ptr) - 1) > 0
|
|
&& (ptr[rlen] == FN_C_AFTER_DIR || ptr[rlen] == FN_C_AFTER_DIR_2)
|
|
&& ptr[rlen - 1] == '.')
|
|
{
|
|
VOID(strmov(esa,ptr));
|
|
esa[rlen - 1] = FN_C_AFTER_DIR;
|
|
esa[rlen] = '\0';
|
|
return (directory_file_name (dst, esa));
|
|
}
|
|
else
|
|
dst[slen - 1] = ':';
|
|
}
|
|
VOID(strmov(dst+slen,"[000000]"));
|
|
slen += 8;
|
|
}
|
|
VOID(strmov(strmov(dst+slen,rptr+1)-1,".DIR.1"));
|
|
return dst;
|
|
}
|
|
VOID(strmov(dst, src));
|
|
if (dst[slen] == '/' && slen > 1)
|
|
dst[slen] = 0;
|
|
return dst;
|
|
#endif /* VMS */
|
|
} /* directory_file_name */
|
|
|
|
#elif defined(WIN32)
|
|
|
|
/*
|
|
*****************************************************************************
|
|
** Read long filename using windows rutines
|
|
*****************************************************************************
|
|
*/
|
|
|
|
MY_DIR *my_dir(const char *path, myf MyFlags)
|
|
{
|
|
struct fileinfo *fnames;
|
|
char *buffer, *obuffer, *tempptr;
|
|
int eof,i,fcnt,firstfcnt,length,maxfcnt;
|
|
uint size;
|
|
#ifdef __BORLANDC__
|
|
struct ffblk find;
|
|
#else
|
|
struct _finddata_t find;
|
|
#endif
|
|
ushort mode;
|
|
char tmp_path[FN_REFLEN],*tmp_file,attrib;
|
|
my_ptrdiff_t diff;
|
|
#ifdef _WIN64
|
|
__int64 handle;
|
|
#else
|
|
long handle;
|
|
#endif
|
|
DBUG_ENTER("my_dir");
|
|
DBUG_PRINT("my",("path: '%s' stat: %d MyFlags: %d",path,MyFlags));
|
|
|
|
/* Put LIB-CHAR as last path-character if not there */
|
|
|
|
tmp_file=tmp_path;
|
|
if (!*path)
|
|
*tmp_file++ ='.'; /* From current dir */
|
|
tmp_file= strmov(tmp_file,path);
|
|
if (tmp_file[-1] == FN_DEVCHAR)
|
|
*tmp_file++= '.'; /* From current dev-dir */
|
|
if (tmp_file[-1] != FN_LIBCHAR)
|
|
*tmp_file++ =FN_LIBCHAR;
|
|
tmp_file[0]='*'; /* MSDOS needs this !??? */
|
|
tmp_file[1]='.';
|
|
tmp_file[2]='*';
|
|
tmp_file[3]='\0';
|
|
|
|
#ifdef __BORLANDC__
|
|
if ((handle= findfirst(tmp_path,&find,0)) == -1L)
|
|
goto error;
|
|
#else
|
|
if ((handle=_findfirst(tmp_path,&find)) == -1L)
|
|
goto error;
|
|
#endif
|
|
|
|
size = STARTSIZE;
|
|
firstfcnt = maxfcnt = (size - sizeof(MY_DIR)) /
|
|
(sizeof(struct fileinfo) + FN_LEN);
|
|
if ((buffer = (char *) my_malloc(size, MyFlags)) == 0)
|
|
goto error;
|
|
fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR));
|
|
tempptr = (char *) (fnames + maxfcnt);
|
|
|
|
fcnt = 0;
|
|
for (;;)
|
|
{
|
|
do
|
|
{
|
|
fnames[fcnt].name = tempptr;
|
|
#ifdef __BORLANDC__
|
|
tempptr = strmov(tempptr,find.ff_name) + 1;
|
|
fnames[fcnt].mystat.st_size=find.ff_fsize;
|
|
fnames[fcnt].mystat.st_uid=fnames[fcnt].mystat.st_gid=0;
|
|
mode=MY_S_IREAD; attrib=find.ff_attrib;
|
|
#else
|
|
tempptr = strmov(tempptr,find.name) + 1;
|
|
fnames[fcnt].mystat.st_size=find.size;
|
|
fnames[fcnt].mystat.st_uid=fnames[fcnt].mystat.st_gid=0;
|
|
mode=MY_S_IREAD; attrib=find.attrib;
|
|
#endif
|
|
if (!(attrib & _A_RDONLY))
|
|
mode|=MY_S_IWRITE;
|
|
if (attrib & _A_SUBDIR)
|
|
mode|=MY_S_IFDIR;
|
|
fnames[fcnt].mystat.st_mode=mode;
|
|
#ifdef __BORLANDC__
|
|
fnames[fcnt].mystat.st_mtime=((uint32) find.ff_ftime);
|
|
#else
|
|
fnames[fcnt].mystat.st_mtime=((uint32) find.time_write);
|
|
#endif
|
|
++fcnt;
|
|
#ifdef __BORLANDC__
|
|
} while ((eof= findnext(&find)) == 0 && fcnt < maxfcnt);
|
|
#else
|
|
} while ((eof= _findnext(handle,&find)) == 0 && fcnt < maxfcnt);
|
|
#endif
|
|
|
|
DBUG_PRINT("test",("eof: %d errno: %d",eof,errno));
|
|
if (eof)
|
|
break;
|
|
size += STARTSIZE; obuffer = buffer;
|
|
if (!(buffer = (char *) my_realloc((gptr) buffer, size,
|
|
MyFlags | MY_FREE_ON_ERROR)))
|
|
goto error;
|
|
length= sizeof(struct fileinfo ) * firstfcnt;
|
|
diff= PTR_BYTE_DIFF(buffer , obuffer) +length;
|
|
fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR));
|
|
tempptr= ADD_TO_PTR(tempptr,diff,char*);
|
|
for (i = 0; i < maxfcnt; i++)
|
|
fnames[i].name = ADD_TO_PTR(fnames[i].name,diff,char*);
|
|
|
|
/* move filenames upp a bit */
|
|
maxfcnt += firstfcnt;
|
|
bmove_upp(tempptr,ADD_TO_PTR(tempptr,-length,char*),
|
|
(int) PTR_BYTE_DIFF(tempptr,fnames+maxfcnt));
|
|
}
|
|
{
|
|
MY_DIR * s = (MY_DIR *) buffer;
|
|
s->number_off_files = (uint) fcnt;
|
|
s->dir_entry = fnames;
|
|
}
|
|
if (!(MyFlags & MY_DONT_SORT))
|
|
qsort(fnames,fcnt,sizeof(struct fileinfo),(qsort_cmp) comp_names);
|
|
#ifndef __BORLANDC__
|
|
_findclose(handle);
|
|
#endif
|
|
DBUG_RETURN((MY_DIR *) buffer);
|
|
|
|
error:
|
|
my_errno=errno;
|
|
#ifndef __BORLANDC__
|
|
if (handle != -1)
|
|
_findclose(handle);
|
|
#endif
|
|
if (MyFlags & MY_FAE+MY_WME)
|
|
my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,errno);
|
|
DBUG_RETURN((MY_DIR *) NULL);
|
|
} /* my_dir */
|
|
|
|
#else /* MSDOS and not WIN32 */
|
|
|
|
|
|
/******************************************************************************
|
|
** At MSDOS you always get stat of files, but time is in packed MSDOS-format
|
|
******************************************************************************/
|
|
|
|
MY_DIR *my_dir(const char* path, myf MyFlags)
|
|
{
|
|
struct fileinfo *fnames;
|
|
char *buffer, *obuffer, *tempptr;
|
|
int eof,i,fcnt,firstfcnt,length,maxfcnt;
|
|
uint size;
|
|
struct find_t find;
|
|
ushort mode;
|
|
char tmp_path[FN_REFLEN],*tmp_file,attrib;
|
|
my_ptrdiff_t diff;
|
|
DBUG_ENTER("my_dir");
|
|
DBUG_PRINT("my",("path: '%s' stat: %d MyFlags: %d",path,MyFlags));
|
|
|
|
/* Put LIB-CHAR as last path-character if not there */
|
|
|
|
tmp_file=tmp_path;
|
|
if (!*path)
|
|
*tmp_file++ ='.'; /* From current dir */
|
|
tmp_file= strmov(tmp_file,path);
|
|
if (tmp_file[-1] == FN_DEVCHAR)
|
|
*tmp_file++= '.'; /* From current dev-dir */
|
|
if (tmp_file[-1] != FN_LIBCHAR)
|
|
*tmp_file++ =FN_LIBCHAR;
|
|
tmp_file[0]='*'; /* MSDOS needs this !??? */
|
|
tmp_file[1]='.';
|
|
tmp_file[2]='*';
|
|
tmp_file[3]='\0';
|
|
|
|
if (_dos_findfirst(tmp_path,_A_NORMAL | _A_SUBDIR, &find))
|
|
goto error;
|
|
|
|
size = STARTSIZE;
|
|
firstfcnt = maxfcnt = (size - sizeof(MY_DIR)) /
|
|
(sizeof(struct fileinfo) + FN_LEN);
|
|
if ((buffer = (char *) my_malloc(size, MyFlags)) == 0)
|
|
goto error;
|
|
fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR));
|
|
tempptr = (char *) (fnames + maxfcnt);
|
|
|
|
fcnt = 0;
|
|
for (;;)
|
|
{
|
|
do
|
|
{
|
|
fnames[fcnt].name = tempptr;
|
|
tempptr = strmov(tempptr,find.name) + 1;
|
|
fnames[fcnt].mystat.st_size=find.size;
|
|
fnames[fcnt].mystat.st_uid=fnames[fcnt].mystat.st_gid=0;
|
|
mode=MY_S_IREAD; attrib=find.attrib;
|
|
if (!(attrib & _A_RDONLY))
|
|
mode|=MY_S_IWRITE;
|
|
if (attrib & _A_SUBDIR)
|
|
mode|=MY_S_IFDIR;
|
|
fnames[fcnt].mystat.st_mode=mode;
|
|
fnames[fcnt].mystat.st_mtime=((uint32) find.wr_date << 16) +
|
|
find.wr_time;
|
|
++fcnt;
|
|
} while ((eof= _dos_findnext(&find)) == 0 && fcnt < maxfcnt);
|
|
|
|
DBUG_PRINT("test",("eof: %d errno: %d",eof,errno));
|
|
if (eof)
|
|
break;
|
|
size += STARTSIZE; obuffer = buffer;
|
|
if (!(buffer = (char *) my_realloc((gptr) buffer, size,
|
|
MyFlags | MY_FREE_ON_ERROR)))
|
|
goto error;
|
|
length= sizeof(struct fileinfo ) * firstfcnt;
|
|
diff= PTR_BYTE_DIFF(buffer , obuffer) +length;
|
|
fnames= (struct fileinfo *) (buffer + sizeof(MY_DIR));
|
|
tempptr= ADD_TO_PTR(tempptr,diff,char*);
|
|
for (i = 0; i < maxfcnt; i++)
|
|
fnames[i].name = ADD_TO_PTR(fnames[i].name,diff,char*);
|
|
|
|
/* move filenames upp a bit */
|
|
maxfcnt += firstfcnt;
|
|
bmove_upp(tempptr,ADD_TO_PTR(tempptr,-length,char*),
|
|
(int) PTR_BYTE_DIFF(tempptr,fnames+maxfcnt));
|
|
}
|
|
{
|
|
MY_DIR * s = (MY_DIR *) buffer;
|
|
s->number_off_files = (uint) fcnt;
|
|
s->dir_entry = fnames;
|
|
}
|
|
if (!(MyFlags & MY_DONT_SORT))
|
|
qsort(fnames,fcnt,sizeof(struct fileinfo),(qsort_cmp) comp_names);
|
|
DBUG_RETURN((MY_DIR *) buffer);
|
|
|
|
error:
|
|
if (MyFlags & MY_FAE+MY_WME)
|
|
my_error(EE_DIR,MYF(ME_BELL+ME_WAITTANG),path,errno);
|
|
DBUG_RETURN((MY_DIR *) NULL);
|
|
} /* my_dir */
|
|
|
|
#endif /* WIN32 && MSDOS */
|
|
|
|
/****************************************************************************
|
|
** File status
|
|
** Note that MY_STAT is assumed to be same as struct stat
|
|
****************************************************************************/
|
|
|
|
int my_fstat(int Filedes, MY_STAT *stat_area,
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("my_fstat");
|
|
DBUG_PRINT("my",("fd: %d MyFlags: %d",Filedes,MyFlags));
|
|
DBUG_RETURN(fstat(Filedes, (struct stat *) stat_area));
|
|
}
|
|
|
|
|
|
MY_STAT *my_stat(const char *path, MY_STAT *stat_area, myf my_flags)
|
|
{
|
|
int m_used;
|
|
DBUG_ENTER("my_stat");
|
|
DBUG_PRINT("my", ("path: '%s', stat_area: %lx, MyFlags: %d", path,
|
|
(byte *) stat_area, my_flags));
|
|
|
|
if ((m_used= (stat_area == NULL)))
|
|
if (!(stat_area = (MY_STAT *) my_malloc(sizeof(MY_STAT), my_flags)))
|
|
goto error;
|
|
if ( ! stat((my_string) path, (struct stat *) stat_area) )
|
|
DBUG_RETURN(stat_area);
|
|
my_errno=errno;
|
|
if (m_used) /* Free if new area */
|
|
my_free((gptr) stat_area,MYF(0));
|
|
|
|
error:
|
|
if (my_flags & (MY_FAE+MY_WME))
|
|
{
|
|
my_error(EE_STAT, MYF(ME_BELL+ME_WAITTANG),path,my_errno);
|
|
DBUG_RETURN((MY_STAT *) NULL);
|
|
}
|
|
DBUG_RETURN((MY_STAT *) NULL);
|
|
} /* my_stat */
|