mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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.
182 lines
5.4 KiB
C
182 lines
5.4 KiB
C
/* Copyright (C) Yuri Dario & 2000 MySQL AB
|
|
All the above parties has a full, independent copyright to
|
|
the following code, including the right to use the code in
|
|
any manner without any demands from the other parties.
|
|
|
|
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 */
|
|
|
|
/* Win32 directory search emulation */
|
|
|
|
#if defined(OS2)
|
|
|
|
//#define _DEBUG
|
|
|
|
long _findfirst( char* path, struct _finddata_t* dos_file)
|
|
{
|
|
HDIR hdir = HDIR_CREATE;
|
|
APIRET rc;
|
|
FILEFINDBUF3 buf3;
|
|
ULONG entries = 1;
|
|
|
|
#ifdef _DEBUG
|
|
printf( "_findfirst path %s\n", path);
|
|
#endif
|
|
|
|
memset( &buf3, 0, sizeof( buf3));
|
|
rc = DosFindFirst(
|
|
path, /* Address of the ASCIIZ path name of the file or subdirectory to be found. */
|
|
&hdir, /* Address of the handle associated with this DosFindFirst request. */
|
|
FILE_NORMAL | FILE_DIRECTORY, /* Attribute value that determines the file objects to be searched for. */
|
|
&buf3, /* Result buffer. */
|
|
sizeof( buf3), /* The length, in bytes, of pfindbuf. */
|
|
&entries, /* Pointer to the number of entries: */
|
|
FIL_STANDARD); /* The level of file information required. */
|
|
|
|
#ifdef _DEBUG
|
|
printf( "_findfirst rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries, buf3.achName);
|
|
#endif
|
|
|
|
if (rc /* && entries == 0 */)
|
|
return -1;
|
|
|
|
if (dos_file) {
|
|
memset( dos_file, 0, sizeof( struct _finddata_t));
|
|
strcpy( dos_file->name, buf3.achName);
|
|
dos_file->size = buf3.cbFile;
|
|
dos_file->attrib = buf3.attrFile;
|
|
}
|
|
return (ULONG) hdir;
|
|
}
|
|
|
|
|
|
long _findnext( long hdir, struct _finddata_t* dos_file)
|
|
{
|
|
APIRET rc;
|
|
FILEFINDBUF3 buf3;
|
|
ULONG entries = 1;
|
|
|
|
memset( &buf3, 0, sizeof( buf3));
|
|
rc = DosFindNext(
|
|
hdir,
|
|
&buf3, /* Result buffer. */
|
|
sizeof( buf3), /* The length, in bytes, of pfindbuf. */
|
|
&entries); /* Pointer to the number of entries: */
|
|
|
|
#ifdef _DEBUG
|
|
printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, hdir, entries, buf3.achName);
|
|
#endif
|
|
|
|
if (rc /* && entries == 0 */)
|
|
return -1;
|
|
|
|
if (dos_file) {
|
|
memset( dos_file, 0, sizeof( struct _finddata_t));
|
|
strcpy( dos_file->name, buf3.achName);
|
|
dos_file->size = buf3.cbFile;
|
|
dos_file->attrib = buf3.attrFile;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void _findclose( long hdir)
|
|
{
|
|
APIRET rc;
|
|
|
|
rc = DosFindClose( hdir);
|
|
#ifdef _DEBUG
|
|
printf( "_findclose rc=%d hdir=%d\n", rc, hdir);
|
|
#endif
|
|
}
|
|
|
|
DIR* opendir( char* path)
|
|
{
|
|
DIR* dir = (DIR*) calloc( 1, sizeof( DIR));
|
|
char buffer[260];
|
|
APIRET rc;
|
|
ULONG entries = 1;
|
|
|
|
strcpy( buffer, path);
|
|
strcat( buffer, "*.*");
|
|
|
|
#ifdef _DEBUG
|
|
printf( "_findfirst path %s\n", buffer);
|
|
#endif
|
|
|
|
dir->hdir = HDIR_CREATE;
|
|
memset( &dir->buf3, 0, sizeof( dir->buf3));
|
|
rc = DosFindFirst(
|
|
buffer, /* Address of the ASCIIZ path name of the file or subdirectory to be found. */
|
|
&dir->hdir, /* Address of the handle associated with this DosFindFirst request. */
|
|
FILE_NORMAL | FILE_DIRECTORY, /* Attribute value that determines the file objects to be searched for. */
|
|
&dir->buf3, /* Result buffer. */
|
|
sizeof( dir->buf3), /* The length, in bytes, of pfindbuf. */
|
|
&entries, /* Pointer to the number of entries: */
|
|
FIL_STANDARD); /* The level of file information required. */
|
|
|
|
#ifdef _DEBUG
|
|
printf( "opendir rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
|
|
#endif
|
|
|
|
if (rc /* && entries == 0 */)
|
|
return NULL;
|
|
|
|
return dir;
|
|
}
|
|
|
|
struct dirent* readdir( DIR* dir)
|
|
{
|
|
APIRET rc;
|
|
//FILEFINDBUF3 buf3;
|
|
ULONG entries = 1;
|
|
|
|
if (!dir->buf3.achName[0]) // file not found on previous query
|
|
return NULL;
|
|
|
|
// copy last file name
|
|
strcpy( dir->ent.d_name, dir->buf3.achName);
|
|
|
|
// query next file
|
|
memset( &dir->buf3, 0, sizeof( dir->buf3));
|
|
rc = DosFindNext(
|
|
dir->hdir,
|
|
&dir->buf3, /* Result buffer. */
|
|
sizeof( dir->buf3), /* The length, in bytes, of pfindbuf. */
|
|
&entries); /* Pointer to the number of entries: */
|
|
|
|
#ifdef _DEBUG
|
|
printf( "_findnext rc=%d hdir=%d entries=%d->%s\n", rc, dir->hdir, entries, dir->buf3.achName);
|
|
#endif
|
|
|
|
if (rc /* && entries == 0 */)
|
|
strcpy( dir->buf3.achName, ""); // reset name for next query
|
|
|
|
return &dir->ent;
|
|
}
|
|
|
|
int closedir (DIR *dir)
|
|
{
|
|
APIRET rc;
|
|
|
|
rc = DosFindClose( dir->hdir);
|
|
#ifdef _DEBUG
|
|
printf( "_findclose rc=%d hdir=%d\n", rc, dir->hdir);
|
|
#endif
|
|
free(dir);
|
|
return 0;
|
|
}
|
|
|
|
|
|
#endif // OS2
|