mirror of
https://github.com/MariaDB/server.git
synced 2025-12-15 08:21:24 +03:00
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
BitKeeper/etc/ignore:
added libmysqld/ha_ndbcluster_cond.cc
---
added debian/defs.mk debian/control
client/completion_hash.cc:
Remove not needed casts
client/my_readline.h:
Remove some old types
client/mysql.cc:
Simplify types
client/mysql_upgrade.c:
Remove some old types
Update call to dirname_part
client/mysqladmin.cc:
Remove some old types
client/mysqlbinlog.cc:
Remove some old types
Change some buffers to be uchar to avoid casts
client/mysqlcheck.c:
Remove some old types
client/mysqldump.c:
Remove some old types
Remove some not needed casts
Change some string lengths to size_t
client/mysqlimport.c:
Remove some old types
client/mysqlshow.c:
Remove some old types
client/mysqlslap.c:
Remove some old types
Remove some not needed casts
client/mysqltest.c:
Removed some old types
Removed some not needed casts
Updated hash-get-key function arguments
Updated parameters to dirname_part()
client/readline.cc:
Removed some old types
Removed some not needed casts
Changed some string lengths to use size_t
client/sql_string.cc:
Removed some old types
dbug/dbug.c:
Removed some old types
Changed some string lengths to use size_t
Changed some prototypes to avoid casts
extra/comp_err.c:
Removed some old types
extra/innochecksum.c:
Removed some old types
extra/my_print_defaults.c:
Removed some old types
extra/mysql_waitpid.c:
Removed some old types
extra/perror.c:
Removed some old types
extra/replace.c:
Removed some old types
Updated parameters to dirname_part()
extra/resolve_stack_dump.c:
Removed some old types
extra/resolveip.c:
Removed some old types
include/config-win.h:
Removed some old types
include/decimal.h:
Changed binary strings to be uchar* instead of char*
include/ft_global.h:
Removed some old types
include/hash.h:
Removed some old types
include/heap.h:
Removed some old types
Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable
include/keycache.h:
Removed some old types
include/m_ctype.h:
Removed some old types
Changed some string lengths to use size_t
Changed character length functions to return uint
unsigned char -> uchar
include/m_string.h:
Removed some old types
Changed some string lengths to use size_t
include/my_alloc.h:
Changed some string lengths to use size_t
include/my_base.h:
Removed some old types
include/my_dbug.h:
Removed some old types
Changed some string lengths to use size_t
Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage
include/my_getopt.h:
Removed some old types
include/my_global.h:
Removed old types:
my_size_t -> size_t
byte -> uchar
gptr -> uchar *
include/my_list.h:
Removed some old types
include/my_nosys.h:
Removed some old types
include/my_pthread.h:
Removed some old types
include/my_sys.h:
Removed some old types
Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read()
Changed some string lengths to use size_t
my_malloc() / my_free() now uses void *
Updated parameters to dirname_part() & my_uncompress()
include/my_tree.h:
Removed some old types
include/my_trie.h:
Removed some old types
include/my_user.h:
Changed some string lengths to use size_t
include/my_vle.h:
Removed some old types
include/my_xml.h:
Removed some old types
Changed some string lengths to use size_t
include/myisam.h:
Removed some old types
include/myisammrg.h:
Removed some old types
include/mysql.h:
Removed some old types
Changed byte streams to use uchar* instead of char*
include/mysql_com.h:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
include/queues.h:
Removed some old types
include/sql_common.h:
Removed some old types
include/sslopt-longopts.h:
Removed some old types
include/violite.h:
Removed some old types
Changed some string lengths to use size_t
libmysql/client_settings.h:
Removed some old types
libmysql/libmysql.c:
Removed some old types
libmysql/manager.c:
Removed some old types
libmysqld/emb_qcache.cc:
Removed some old types
libmysqld/emb_qcache.h:
Removed some old types
libmysqld/lib_sql.cc:
Removed some old types
Removed some not needed casts
Changed some buffers to be uchar* to avoid casts
true -> TRUE, false -> FALSE
mysys/array.c:
Removed some old types
mysys/charset.c:
Changed some string lengths to use size_t
mysys/checksum.c:
Include zlib to get definition for crc32
Removed some old types
mysys/default.c:
Removed some old types
Changed some string lengths to use size_t
mysys/default_modify.c:
Changed some string lengths to use size_t
Removed some not needed casts
mysys/hash.c:
Removed some old types
Changed some string lengths to use size_t
Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function.
hash_element now takes 'ulong' as the index type (cleanup)
mysys/list.c:
Removed some old types
mysys/mf_cache.c:
Changed some string lengths to use size_t
mysys/mf_dirname.c:
Removed some old types
Changed some string lengths to use size_t
Added argument to dirname_part() to avoid calculation of length for 'to'
mysys/mf_fn_ext.c:
Removed some old types
Updated parameters to dirname_part()
mysys/mf_format.c:
Removed some old types
Changed some string lengths to use size_t
mysys/mf_getdate.c:
Removed some old types
mysys/mf_iocache.c:
Removed some old types
Changed some string lengths to use size_t
Changed calculation of 'max_length' to be done the same way in all functions
mysys/mf_iocache2.c:
Removed some old types
Changed some string lengths to use size_t
Clean up comments
Removed not needed indentation
mysys/mf_keycache.c:
Removed some old types
mysys/mf_keycaches.c:
Removed some old types
mysys/mf_loadpath.c:
Removed some old types
mysys/mf_pack.c:
Removed some old types
Changed some string lengths to use size_t
Removed some not needed casts
Removed very old VMS code
Updated parameters to dirname_part()
Use result of dirnam_part() to remove call to strcat()
mysys/mf_path.c:
Removed some old types
mysys/mf_radix.c:
Removed some old types
mysys/mf_same.c:
Removed some old types
mysys/mf_sort.c:
Removed some old types
mysys/mf_soundex.c:
Removed some old types
mysys/mf_strip.c:
Removed some old types
mysys/mf_tempdir.c:
Removed some old types
mysys/mf_unixpath.c:
Removed some old types
mysys/mf_wfile.c:
Removed some old types
mysys/mulalloc.c:
Removed some old types
mysys/my_alloc.c:
Removed some old types
Changed some string lengths to use size_t
Use void* as type for allocated memory area
Removed some not needed casts
Changed argument 'Size' to 'length' according coding guidelines
mysys/my_chsize.c:
Changed some buffers to be uchar* to avoid casts
mysys/my_compress.c:
More comments
Removed some old types
Changed string lengths to use size_t
Changed arguments to my_uncompress() to make them easier to understand
Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix)
Changed type of 'pack_data' argument to packfrm() to avoid casts.
mysys/my_conio.c:
Changed some string lengths to use size_t
mysys/my_create.c:
Removed some old types
mysys/my_div.c:
Removed some old types
mysys/my_error.c:
Removed some old types
mysys/my_fopen.c:
Removed some old types
mysys/my_fstream.c:
Removed some old types
Changed some string lengths to use size_t
writen -> written
mysys/my_getopt.c:
Removed some old types
mysys/my_getwd.c:
Removed some old types
More comments
mysys/my_init.c:
Removed some old types
mysys/my_largepage.c:
Removed some old types
Changed some string lengths to use size_t
mysys/my_lib.c:
Removed some old types
mysys/my_lockmem.c:
Removed some old types
mysys/my_malloc.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed all functions to use size_t
mysys/my_memmem.c:
Indentation cleanup
mysys/my_once.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
mysys/my_open.c:
Removed some old types
mysys/my_pread.c:
Removed some old types
Changed all functions to use size_t
Added comment for how my_pread() / my_pwrite() are supposed to work.
Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe.
(If we ever would really need this, it should be enabled only with a flag argument)
mysys/my_quick.c:
Removed some old types
Changed all functions to use size_t
mysys/my_read.c:
Removed some old types
Changed all functions to use size_t
mysys/my_realloc.c:
Removed some old types
Use void* as type for allocated memory area
Changed all functions to use size_t
mysys/my_static.c:
Removed some old types
mysys/my_static.h:
Removed some old types
mysys/my_vle.c:
Removed some old types
mysys/my_wincond.c:
Removed some old types
mysys/my_windac.c:
Removed some old types
mysys/my_write.c:
Removed some old types
Changed all functions to use size_t
mysys/ptr_cmp.c:
Removed some old types
Changed all functions to use size_t
mysys/queues.c:
Removed some old types
mysys/safemalloc.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed all functions to use size_t
mysys/string.c:
Removed some old types
Changed all functions to use size_t
mysys/testhash.c:
Removed some old types
mysys/thr_alarm.c:
Removed some old types
mysys/thr_lock.c:
Removed some old types
mysys/tree.c:
Removed some old types
mysys/trie.c:
Removed some old types
mysys/typelib.c:
Removed some old types
plugin/daemon_example/daemon_example.cc:
Removed some old types
regex/reginit.c:
Removed some old types
server-tools/instance-manager/buffer.cc:
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/buffer.h:
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/commands.cc:
Removed some old types
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/instance_map.cc:
Removed some old types
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/instance_options.cc:
Changed buffer to be of type uchar*
Replaced alloc_root + strcpy() with strdup_root()
server-tools/instance-manager/mysql_connection.cc:
Changed buffer to be of type uchar*
server-tools/instance-manager/options.cc:
Removed some old types
server-tools/instance-manager/parse.cc:
Changed some string lengths to use size_t
server-tools/instance-manager/parse.h:
Removed some old types
Changed some string lengths to use size_t
server-tools/instance-manager/protocol.cc:
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
server-tools/instance-manager/protocol.h:
Changed some string lengths to use size_t
server-tools/instance-manager/user_map.cc:
Removed some old types
Changed some string lengths to use size_t
sql/derror.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/discover.cc:
Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
sql/event_data_objects.cc:
Removed some old types
Added missing casts for alloc() and sprintf()
sql/event_db_repository.cc:
Changed some buffers to be uchar* to avoid casts
Added missing casts for sprintf()
sql/event_queue.cc:
Removed some old types
sql/field.cc:
Removed some old types
Changed memory buffers to be uchar*
Changed some string lengths to use size_t
Removed a lot of casts
Safety fix in Field_blob::val_decimal() to not access zero pointer
sql/field.h:
Removed some old types
Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes).
Changed some string lengths to use size_t
Removed some not needed casts
Changed val_xxx(xxx, new_ptr) to take const pointers
sql/field_conv.cc:
Removed some old types
Added casts required because memory area pointers are now uchar*
sql/filesort.cc:
Initalize variable that was used unitialized in error conditions
sql/gen_lex_hash.cc:
Removed some old types
Changed memory buffers to be uchar*
Changed some string lengths to use size_t
Removed a lot of casts
Safety fix in Field_blob::val_decimal() to not access zero pointer
sql/gstream.h:
Added required cast
sql/ha_ndbcluster.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
Added required casts
Removed some not needed casts
sql/ha_ndbcluster.h:
Removed some old types
sql/ha_ndbcluster_binlog.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake()
Changed some string lengths to use size_t
Added missing casts for alloc() and sprintf()
sql/ha_ndbcluster_binlog.h:
Removed some old types
sql/ha_ndbcluster_cond.cc:
Removed some old types
Removed some not needed casts
sql/ha_ndbcluster_cond.h:
Removed some old types
sql/ha_partition.cc:
Removed some old types
Changed prototype for change_partition() to avoid casts
sql/ha_partition.h:
Removed some old types
sql/handler.cc:
Removed some old types
Changed some string lengths to use size_t
sql/handler.h:
Removed some old types
Changed some string lengths to use size_t
Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts
sql/hash_filo.h:
Removed some old types
Changed all functions to use size_t
sql/hostname.cc:
Removed some old types
sql/item.cc:
Removed some old types
Changed some string lengths to use size_t
Use strmake() instead of memdup() to create a null terminated string.
Updated calls to new Field()
sql/item.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed some buffers to be uchar* to avoid casts
sql/item_cmpfunc.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/item_cmpfunc.h:
Removed some old types
sql/item_create.cc:
Removed some old types
sql/item_func.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added test for failing alloc() in init_result_field()
Remove old confusing comment
Fixed compiler warning
sql/item_func.h:
Removed some old types
sql/item_row.cc:
Removed some old types
sql/item_row.h:
Removed some old types
sql/item_strfunc.cc:
Include zlib (needed becasue we call crc32)
Removed some old types
sql/item_strfunc.h:
Removed some old types
Changed some types to match new function prototypes
sql/item_subselect.cc:
Removed some old types
sql/item_subselect.h:
Removed some old types
sql/item_sum.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/item_sum.h:
Removed some old types
sql/item_timefunc.cc:
Removed some old types
Changed some string lengths to use size_t
sql/item_timefunc.h:
Removed some old types
sql/item_xmlfunc.cc:
Changed some string lengths to use size_t
sql/item_xmlfunc.h:
Removed some old types
sql/key.cc:
Removed some old types
Removed some not needed casts
sql/lock.cc:
Removed some old types
Added some cast to my_multi_malloc() arguments for safety
sql/log.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Changed usage of pwrite() to not assume it holds the cursor position for the file
Made usage of my_read() safer
sql/log_event.cc:
Removed some old types
Added checking of return value of malloc() in pack_info()
Changed some buffers to be uchar* to avoid casts
Removed some 'const' to avoid casts
Added missing casts for alloc() and sprintf()
Added required casts
Removed some not needed casts
Added some cast to my_multi_malloc() arguments for safety
sql/log_event.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/log_event_old.cc:
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/log_event_old.h:
Changed some buffers to be uchar* to avoid casts
sql/mf_iocache.cc:
Removed some old types
sql/my_decimal.cc:
Changed memory area to use uchar*
sql/my_decimal.h:
Changed memory area to use uchar*
sql/mysql_priv.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed some string lengths to use size_t
Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow
Changed some buffers to be uchar* to avoid casts
sql/mysqld.cc:
Removed some old types
sql/net_serv.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Ensure that vio_read()/vio_write() return values are stored in a size_t variable
Removed some not needed casts
sql/opt_range.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/opt_range.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/opt_sum.cc:
Removed some old types
Removed some not needed casts
sql/parse_file.cc:
Removed some old types
Changed some string lengths to use size_t
Changed alloc_root + memcpy + set end 0 -> strmake_root()
sql/parse_file.h:
Removed some old types
sql/partition_info.cc:
Removed some old types
Added missing casts for alloc()
Changed some buffers to be uchar* to avoid casts
sql/partition_info.h:
Changed some buffers to be uchar* to avoid casts
sql/protocol.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/protocol.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/records.cc:
Removed some old types
sql/repl_failsafe.cc:
Removed some old types
Changed some string lengths to use size_t
Added required casts
sql/rpl_filter.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some string lengths to use size_t
sql/rpl_filter.h:
Changed some string lengths to use size_t
sql/rpl_injector.h:
Removed some old types
sql/rpl_record.cc:
Removed some old types
Removed some not needed casts
Changed some buffers to be uchar* to avoid casts
sql/rpl_record.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/rpl_record_old.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/rpl_record_old.h:
Removed some old types
Changed some buffers to be uchar* to avoid cast
sql/rpl_rli.cc:
Removed some old types
sql/rpl_tblmap.cc:
Removed some old types
sql/rpl_tblmap.h:
Removed some old types
sql/rpl_utility.cc:
Removed some old types
sql/rpl_utility.h:
Removed some old types
Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length
sql/set_var.cc:
Removed some old types
Updated parameters to dirname_part()
sql/set_var.h:
Removed some old types
sql/slave.cc:
Removed some old types
Changed some string lengths to use size_t
sql/slave.h:
Removed some old types
sql/sp.cc:
Removed some old types
Added missing casts for printf()
sql/sp.h:
Removed some old types
Updated hash-get-key function arguments
sql/sp_cache.cc:
Removed some old types
Added missing casts for printf()
Updated hash-get-key function arguments
sql/sp_head.cc:
Removed some old types
Added missing casts for alloc() and printf()
Added required casts
Updated hash-get-key function arguments
sql/sp_head.h:
Removed some old types
sql/sp_pcontext.cc:
Removed some old types
sql/sp_pcontext.h:
Removed some old types
sql/sql_acl.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added required casts
sql/sql_analyse.cc:
Changed some buffers to be uchar* to avoid casts
sql/sql_analyse.h:
Changed some buffers to be uchar* to avoid casts
sql/sql_array.h:
Removed some old types
sql/sql_base.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_binlog.cc:
Removed some old types
Added missing casts for printf()
sql/sql_cache.cc:
Removed some old types
Updated hash-get-key function arguments
Removed some not needed casts
Changed some string lengths to use size_t
sql/sql_cache.h:
Removed some old types
Removed reference to not existing function cache_key()
Updated hash-get-key function arguments
sql/sql_class.cc:
Removed some old types
Updated hash-get-key function arguments
Added missing casts for alloc()
Updated hash-get-key function arguments
Moved THD::max_row_length() to table.cc (as it's not depending on THD)
Removed some not needed casts
sql/sql_class.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Removed some not needed casts
Changed some string lengths to use size_t
Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD
sql/sql_connect.cc:
Removed some old types
Added required casts
sql/sql_db.cc:
Removed some old types
Removed some not needed casts
Added some cast to my_multi_malloc() arguments for safety
Added missing casts for alloc()
sql/sql_delete.cc:
Removed some old types
sql/sql_handler.cc:
Removed some old types
Updated hash-get-key function arguments
Added some cast to my_multi_malloc() arguments for safety
sql/sql_help.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_insert.cc:
Removed some old types
Added missing casts for alloc() and printf()
sql/sql_lex.cc:
Removed some old types
sql/sql_lex.h:
Removed some old types
Removed some not needed casts
sql/sql_list.h:
Removed some old types
Removed some not needed casts
sql/sql_load.cc:
Removed some old types
Removed compiler warning
sql/sql_manager.cc:
Removed some old types
sql/sql_map.cc:
Removed some old types
sql/sql_map.h:
Removed some old types
sql/sql_olap.cc:
Removed some old types
sql/sql_parse.cc:
Removed some old types
Trivial move of code lines to make things more readable
Changed some string lengths to use size_t
Added missing casts for alloc()
sql/sql_partition.cc:
Removed some old types
Removed compiler warnings about not used functions
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_partition.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/sql_plugin.cc:
Removed some old types
Added missing casts for alloc()
Updated hash-get-key function arguments
sql/sql_prepare.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Added missing casts for alloc() and printf()
sql-common/client.c:
Removed some old types
Changed some memory areas to use uchar*
sql-common/my_user.c:
Changed some string lengths to use size_t
sql-common/pack.c:
Changed some buffers to be uchar* to avoid casts
sql/sql_repl.cc:
Added required casts
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/sql_select.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some old types
sql/sql_select.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/sql_servers.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_show.cc:
Removed some old types
Added missing casts for alloc()
Removed some not needed casts
sql/sql_string.cc:
Removed some old types
Added required casts
sql/sql_table.cc:
Removed some old types
Removed compiler warning about not used variable
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_test.cc:
Removed some old types
sql/sql_trigger.cc:
Removed some old types
Added missing casts for alloc()
sql/sql_udf.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_union.cc:
Removed some old types
sql/sql_update.cc:
Removed some old types
Removed some not needed casts
sql/sql_view.cc:
Removed some old types
sql/sql_yacc.yy:
Removed some old types
Changed some string lengths to use size_t
Added missing casts for alloc()
sql/stacktrace.c:
Removed some old types
sql/stacktrace.h:
Removed some old types
sql/structs.h:
Removed some old types
sql/table.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
Removed setting of LEX_STRING() arguments in declaration
Added required casts
More function comments
Moved max_row_length() here from sql_class.cc/sql_class.h
sql/table.h:
Removed some old types
Changed some string lengths to use size_t
sql/thr_malloc.cc:
Use void* as type for allocated memory area
Changed all functions to use size_t
sql/tzfile.h:
Changed some buffers to be uchar* to avoid casts
sql/tztime.cc:
Changed some buffers to be uchar* to avoid casts
Updated hash-get-key function arguments
Added missing casts for alloc()
Removed some not needed casts
sql/uniques.cc:
Removed some old types
Removed some not needed casts
sql/unireg.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added missing casts for alloc()
storage/archive/archive_reader.c:
Removed some old types
storage/archive/azio.c:
Removed some old types
Removed some not needed casts
storage/archive/ha_archive.cc:
Removed some old types
Changed type for 'frmblob' in archive_discover() to match handler
Updated hash-get-key function arguments
Removed some not needed casts
storage/archive/ha_archive.h:
Removed some old types
storage/blackhole/ha_blackhole.cc:
Removed some old types
storage/blackhole/ha_blackhole.h:
Removed some old types
storage/csv/ha_tina.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
storage/csv/ha_tina.h:
Removed some old types
Removed some not needed casts
storage/csv/transparent_file.cc:
Removed some old types
Changed type of 'bytes_read' to be able to detect read errors
Fixed indentation
storage/csv/transparent_file.h:
Removed some old types
storage/example/ha_example.cc:
Removed some old types
Updated hash-get-key function arguments
storage/example/ha_example.h:
Removed some old types
storage/federated/ha_federated.cc:
Removed some old types
Updated hash-get-key function arguments
Removed some not needed casts
storage/federated/ha_federated.h:
Removed some old types
storage/heap/_check.c:
Changed some buffers to be uchar* to avoid casts
storage/heap/_rectest.c:
Removed some old types
storage/heap/ha_heap.cc:
Removed some old types
storage/heap/ha_heap.h:
Removed some old types
storage/heap/heapdef.h:
Removed some old types
storage/heap/hp_block.c:
Removed some old types
Changed some string lengths to use size_t
storage/heap/hp_clear.c:
Removed some old types
storage/heap/hp_close.c:
Removed some old types
storage/heap/hp_create.c:
Removed some old types
storage/heap/hp_delete.c:
Removed some old types
storage/heap/hp_hash.c:
Removed some old types
storage/heap/hp_info.c:
Removed some old types
storage/heap/hp_open.c:
Removed some old types
storage/heap/hp_rfirst.c:
Removed some old types
storage/heap/hp_rkey.c:
Removed some old types
storage/heap/hp_rlast.c:
Removed some old types
storage/heap/hp_rnext.c:
Removed some old types
storage/heap/hp_rprev.c:
Removed some old types
storage/heap/hp_rrnd.c:
Removed some old types
storage/heap/hp_rsame.c:
Removed some old types
storage/heap/hp_scan.c:
Removed some old types
storage/heap/hp_test1.c:
Removed some old types
storage/heap/hp_test2.c:
Removed some old types
storage/heap/hp_update.c:
Removed some old types
storage/heap/hp_write.c:
Removed some old types
Changed some string lengths to use size_t
storage/innobase/handler/ha_innodb.cc:
Removed some old types
Updated hash-get-key function arguments
Added missing casts for alloc() and printf()
Removed some not needed casts
storage/innobase/handler/ha_innodb.h:
Removed some old types
storage/myisam/ft_boolean_search.c:
Removed some old types
storage/myisam/ft_nlq_search.c:
Removed some old types
storage/myisam/ft_parser.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/ft_static.c:
Removed some old types
storage/myisam/ft_stopwords.c:
Removed some old types
storage/myisam/ft_update.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/ftdefs.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/fulltext.h:
Removed some old types
storage/myisam/ha_myisam.cc:
Removed some old types
storage/myisam/ha_myisam.h:
Removed some old types
storage/myisam/mi_cache.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/mi_check.c:
Removed some old types
storage/myisam/mi_checksum.c:
Removed some old types
storage/myisam/mi_close.c:
Removed some old types
storage/myisam/mi_create.c:
Removed some old types
storage/myisam/mi_delete.c:
Removed some old types
storage/myisam/mi_delete_all.c:
Removed some old types
storage/myisam/mi_dynrec.c:
Removed some old types
storage/myisam/mi_extra.c:
Removed some old types
storage/myisam/mi_key.c:
Removed some old types
storage/myisam/mi_locking.c:
Removed some old types
storage/myisam/mi_log.c:
Removed some old types
storage/myisam/mi_open.c:
Removed some old types
Removed some not needed casts
Check argument of my_write()/my_pwrite() in functions returning int
Added casting of string lengths to size_t
storage/myisam/mi_packrec.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/mi_page.c:
Removed some old types
storage/myisam/mi_preload.c:
Removed some old types
storage/myisam/mi_range.c:
Removed some old types
storage/myisam/mi_rfirst.c:
Removed some old types
storage/myisam/mi_rkey.c:
Removed some old types
storage/myisam/mi_rlast.c:
Removed some old types
storage/myisam/mi_rnext.c:
Removed some old types
storage/myisam/mi_rnext_same.c:
Removed some old types
storage/myisam/mi_rprev.c:
Removed some old types
storage/myisam/mi_rrnd.c:
Removed some old types
storage/myisam/mi_rsame.c:
Removed some old types
storage/myisam/mi_rsamepos.c:
Removed some old types
storage/myisam/mi_scan.c:
Removed some old types
storage/myisam/mi_search.c:
Removed some old types
storage/myisam/mi_static.c:
Removed some old types
storage/myisam/mi_statrec.c:
Removed some old types
storage/myisam/mi_test1.c:
Removed some old types
storage/myisam/mi_test2.c:
Removed some old types
storage/myisam/mi_test3.c:
Removed some old types
storage/myisam/mi_unique.c:
Removed some old types
storage/myisam/mi_update.c:
Removed some old types
storage/myisam/mi_write.c:
Removed some old types
storage/myisam/myisam_ftdump.c:
Removed some old types
storage/myisam/myisamchk.c:
Removed some old types
storage/myisam/myisamdef.h:
Removed some old types
storage/myisam/myisamlog.c:
Removed some old types
Indentation fix
storage/myisam/myisampack.c:
Removed some old types
storage/myisam/rt_index.c:
Removed some old types
storage/myisam/rt_split.c:
Removed some old types
storage/myisam/sort.c:
Removed some old types
storage/myisam/sp_defs.h:
Removed some old types
storage/myisam/sp_key.c:
Removed some old types
storage/myisammrg/ha_myisammrg.cc:
Removed some old types
storage/myisammrg/ha_myisammrg.h:
Removed some old types
storage/myisammrg/myrg_close.c:
Removed some old types
storage/myisammrg/myrg_def.h:
Removed some old types
storage/myisammrg/myrg_delete.c:
Removed some old types
storage/myisammrg/myrg_open.c:
Removed some old types
Updated parameters to dirname_part()
storage/myisammrg/myrg_queue.c:
Removed some old types
storage/myisammrg/myrg_rfirst.c:
Removed some old types
storage/myisammrg/myrg_rkey.c:
Removed some old types
storage/myisammrg/myrg_rlast.c:
Removed some old types
storage/myisammrg/myrg_rnext.c:
Removed some old types
storage/myisammrg/myrg_rnext_same.c:
Removed some old types
storage/myisammrg/myrg_rprev.c:
Removed some old types
storage/myisammrg/myrg_rrnd.c:
Removed some old types
storage/myisammrg/myrg_rsame.c:
Removed some old types
storage/myisammrg/myrg_update.c:
Removed some old types
storage/myisammrg/myrg_write.c:
Removed some old types
storage/ndb/include/util/ndb_opts.h:
Removed some old types
storage/ndb/src/cw/cpcd/main.cpp:
Removed some old types
storage/ndb/src/kernel/vm/Configuration.cpp:
Removed some old types
storage/ndb/src/mgmclient/main.cpp:
Removed some old types
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Removed some old types
Removed old disabled code
storage/ndb/src/mgmsrv/main.cpp:
Removed some old types
storage/ndb/src/ndbapi/NdbBlob.cpp:
Removed some old types
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Removed not used variable
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
Added required casts
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Added required casts
storage/ndb/tools/delete_all.cpp:
Removed some old types
storage/ndb/tools/desc.cpp:
Removed some old types
storage/ndb/tools/drop_index.cpp:
Removed some old types
storage/ndb/tools/drop_tab.cpp:
Removed some old types
storage/ndb/tools/listTables.cpp:
Removed some old types
storage/ndb/tools/ndb_config.cpp:
Removed some old types
storage/ndb/tools/restore/consumer_restore.cpp:
Changed some buffers to be uchar* to avoid casts with new defintion of packfrm()
storage/ndb/tools/restore/restore_main.cpp:
Removed some old types
storage/ndb/tools/select_all.cpp:
Removed some old types
storage/ndb/tools/select_count.cpp:
Removed some old types
storage/ndb/tools/waiter.cpp:
Removed some old types
strings/bchange.c:
Changed function to use uchar * and size_t
strings/bcmp.c:
Changed function to use uchar * and size_t
strings/bmove512.c:
Changed function to use uchar * and size_t
strings/bmove_upp.c:
Changed function to use uchar * and size_t
strings/ctype-big5.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-bin.c:
Changed functions to use size_t
strings/ctype-cp932.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-czech.c:
Fixed indentation
Changed functions to use size_t
strings/ctype-euc_kr.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-eucjpms.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-gb2312.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-gbk.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-latin1.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-mb.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-simple.c:
Changed functions to use size_t
Simpler loops for caseup/casedown
unsigned int -> uint
unsigned char -> uchar
strings/ctype-sjis.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-tis620.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-uca.c:
Changed functions to use size_t
unsigned char -> uchar
strings/ctype-ucs2.c:
Moved inclusion of stdarg.h to other includes
usigned char -> uchar
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-ujis.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-utf8.c:
Changed functions to use size_t
unsigned char -> uchar
Indentation fixes
strings/ctype-win1250ch.c:
Indentation fixes
Changed functions to use size_t
strings/ctype.c:
Changed functions to use size_t
strings/decimal.c:
Changed type for memory argument to uchar *
strings/do_ctype.c:
Indentation fixes
strings/my_strtoll10.c:
unsigned char -> uchar
strings/my_vsnprintf.c:
Changed functions to use size_t
strings/r_strinstr.c:
Removed some old types
Changed functions to use size_t
strings/str_test.c:
Removed some old types
strings/strappend.c:
Changed functions to use size_t
strings/strcont.c:
Removed some old types
strings/strfill.c:
Removed some old types
strings/strinstr.c:
Changed functions to use size_t
strings/strlen.c:
Changed functions to use size_t
strings/strmake.c:
Changed functions to use size_t
strings/strnlen.c:
Changed functions to use size_t
strings/strnmov.c:
Changed functions to use size_t
strings/strto.c:
unsigned char -> uchar
strings/strtod.c:
Changed functions to use size_t
strings/strxnmov.c:
Changed functions to use size_t
strings/xml.c:
Changed functions to use size_t
Indentation fixes
tests/mysql_client_test.c:
Removed some old types
tests/thread_test.c:
Removed some old types
vio/test-ssl.c:
Removed some old types
vio/test-sslclient.c:
Removed some old types
vio/test-sslserver.c:
Removed some old types
vio/vio.c:
Removed some old types
vio/vio_priv.h:
Removed some old types
Changed vio_read()/vio_write() to work with size_t
vio/viosocket.c:
Changed vio_read()/vio_write() to work with size_t
Indentation fixes
vio/viossl.c:
Changed vio_read()/vio_write() to work with size_t
Indentation fixes
vio/viosslfactories.c:
Removed some old types
vio/viotest-ssl.c:
Removed some old types
win/README:
More explanations
1062 lines
29 KiB
C
1062 lines
29 KiB
C
/* Copyright (C) 2000-2003 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/****************************************************************************
|
|
Add all options from files named "group".cnf from the default_directories
|
|
before the command line arguments.
|
|
On Windows defaults will also search in the Windows directory for a file
|
|
called 'group'.ini
|
|
As long as the program uses the last argument for conflicting
|
|
options one only have to add a call to "load_defaults" to enable
|
|
use of default values.
|
|
pre- and end 'blank space' are removed from options and values. The
|
|
following escape sequences are recognized in values: \b \t \n \r \\
|
|
|
|
The following arguments are handled automaticly; If used, they must be
|
|
first argument on the command line!
|
|
--no-defaults ; no options are read.
|
|
--defaults-file=full-path-to-default-file ; Only this file will be read.
|
|
--defaults-extra-file=full-path-to-default-file ; Read this file before ~/
|
|
--defaults-group-suffix ; Also read groups with concat(group, suffix)
|
|
--print-defaults ; Print the modified command line and exit
|
|
****************************************************************************/
|
|
|
|
#include "mysys_priv.h"
|
|
#include "m_string.h"
|
|
#include "m_ctype.h"
|
|
#include <my_dir.h>
|
|
#ifdef __WIN__
|
|
#include <winbase.h>
|
|
#endif
|
|
|
|
const char *my_defaults_file=0;
|
|
const char *my_defaults_group_suffix=0;
|
|
char *my_defaults_extra_file=0;
|
|
|
|
/* Which directories are searched for options (and in which order) */
|
|
|
|
#define MAX_DEFAULT_DIRS 7
|
|
const char *default_directories[MAX_DEFAULT_DIRS + 1];
|
|
|
|
#ifdef __WIN__
|
|
static const char *f_extensions[]= { ".ini", ".cnf", 0 };
|
|
#define NEWLINE "\r\n"
|
|
static char system_dir[FN_REFLEN], shared_system_dir[FN_REFLEN],
|
|
config_dir[FN_REFLEN];
|
|
#else
|
|
static const char *f_extensions[]= { ".cnf", 0 };
|
|
#define NEWLINE "\n"
|
|
#endif
|
|
|
|
static int handle_default_option(void *in_ctx, const char *group_name,
|
|
const char *option);
|
|
|
|
/*
|
|
This structure defines the context that we pass to callback
|
|
function 'handle_default_option' used in search_default_file
|
|
to process each option. This context is used if search_default_file
|
|
was called from load_defaults.
|
|
*/
|
|
|
|
struct handle_option_ctx
|
|
{
|
|
MEM_ROOT *alloc;
|
|
DYNAMIC_ARRAY *args;
|
|
TYPELIB *group;
|
|
};
|
|
|
|
static int search_default_file(Process_option_func func, void *func_ctx,
|
|
const char *dir, const char *config_file);
|
|
static int search_default_file_with_ext(Process_option_func func,
|
|
void *func_ctx,
|
|
const char *dir, const char *ext,
|
|
const char *config_file, int recursion_level);
|
|
static void init_default_directories();
|
|
|
|
static char *remove_end_comment(char *ptr);
|
|
|
|
|
|
/*
|
|
Process config files in default directories.
|
|
|
|
SYNOPSIS
|
|
my_search_option_files()
|
|
conf_file Basename for configuration file to search for.
|
|
If this is a path, then only this file is read.
|
|
argc Pointer to argc of original program
|
|
argv Pointer to argv of original program
|
|
args_used Pointer to variable for storing the number of
|
|
arguments used.
|
|
func Pointer to the function to process options
|
|
func_ctx It's context. Usually it is the structure to
|
|
store additional options.
|
|
DESCRIPTION
|
|
Process the default options from argc & argv
|
|
Read through each found config file looks and calls 'func' to process
|
|
each option.
|
|
|
|
NOTES
|
|
--defaults-group-suffix is only processed if we are called from
|
|
load_defaults().
|
|
|
|
|
|
RETURN
|
|
0 ok
|
|
1 given cinf_file doesn't exist
|
|
|
|
The global variable 'my_defaults_group_suffix' is updated with value for
|
|
--defaults_group_suffix
|
|
*/
|
|
|
|
int my_search_option_files(const char *conf_file, int *argc, char ***argv,
|
|
uint *args_used, Process_option_func func,
|
|
void *func_ctx)
|
|
{
|
|
const char **dirs, *forced_default_file, *forced_extra_defaults;
|
|
int error= 0;
|
|
DBUG_ENTER("my_search_option_files");
|
|
|
|
/* Check if we want to force the use a specific default file */
|
|
*args_used+= get_defaults_options(*argc - *args_used, *argv + *args_used,
|
|
(char **) &forced_default_file,
|
|
(char **) &forced_extra_defaults,
|
|
(char **) &my_defaults_group_suffix);
|
|
|
|
if (! my_defaults_group_suffix)
|
|
my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
|
|
|
|
if (forced_extra_defaults)
|
|
my_defaults_extra_file= (char *) forced_extra_defaults;
|
|
|
|
if (forced_default_file)
|
|
my_defaults_file= forced_default_file;
|
|
|
|
/*
|
|
We can only handle 'defaults-group-suffix' if we are called from
|
|
load_defaults() as otherwise we can't know the type of 'func_ctx'
|
|
*/
|
|
|
|
if (my_defaults_group_suffix && func == handle_default_option)
|
|
{
|
|
/* Handle --defaults-group-suffix= */
|
|
uint i;
|
|
const char **extra_groups;
|
|
const uint instance_len= strlen(my_defaults_group_suffix);
|
|
struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx;
|
|
char *ptr;
|
|
TYPELIB *group= ctx->group;
|
|
|
|
if (!(extra_groups=
|
|
(const char**)alloc_root(ctx->alloc,
|
|
(2*group->count+1)*sizeof(char*))))
|
|
goto err;
|
|
|
|
for (i= 0; i < group->count; i++)
|
|
{
|
|
uint len;
|
|
extra_groups[i]= group->type_names[i]; /** copy group */
|
|
|
|
len= strlen(extra_groups[i]);
|
|
if (!(ptr= alloc_root(ctx->alloc, len+instance_len+1)))
|
|
goto err;
|
|
|
|
extra_groups[i+group->count]= ptr;
|
|
|
|
/** Construct new group */
|
|
memcpy(ptr, extra_groups[i], len);
|
|
memcpy(ptr+len, my_defaults_group_suffix, instance_len+1);
|
|
}
|
|
|
|
group->count*= 2;
|
|
group->type_names= extra_groups;
|
|
group->type_names[group->count]= 0;
|
|
}
|
|
|
|
if (forced_default_file)
|
|
{
|
|
if ((error= search_default_file_with_ext(func, func_ctx, "", "",
|
|
forced_default_file, 0)) < 0)
|
|
goto err;
|
|
if (error > 0)
|
|
{
|
|
fprintf(stderr, "Could not open required defaults file: %s\n",
|
|
forced_default_file);
|
|
goto err;
|
|
}
|
|
}
|
|
else if (dirname_length(conf_file))
|
|
{
|
|
if ((error= search_default_file(func, func_ctx, NullS, conf_file)) < 0)
|
|
goto err;
|
|
}
|
|
else
|
|
{
|
|
for (dirs= default_directories ; *dirs; dirs++)
|
|
{
|
|
if (**dirs)
|
|
{
|
|
if (search_default_file(func, func_ctx, *dirs, conf_file) < 0)
|
|
goto err;
|
|
}
|
|
else if (my_defaults_extra_file)
|
|
{
|
|
if ((error= search_default_file_with_ext(func, func_ctx, "", "",
|
|
my_defaults_extra_file, 0)) < 0)
|
|
goto err; /* Fatal error */
|
|
if (error > 0)
|
|
{
|
|
fprintf(stderr, "Could not open required defaults file: %s\n",
|
|
my_defaults_extra_file);
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
err:
|
|
fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
|
|
exit(1);
|
|
return 0; /* Keep compiler happy */
|
|
}
|
|
|
|
|
|
/*
|
|
The option handler for load_defaults.
|
|
|
|
SYNOPSIS
|
|
handle_deault_option()
|
|
in_ctx Handler context. In this case it is a
|
|
handle_option_ctx structure.
|
|
group_name The name of the group the option belongs to.
|
|
option The very option to be processed. It is already
|
|
prepared to be used in argv (has -- prefix). If it
|
|
is NULL, we are handling a new group (section).
|
|
|
|
DESCRIPTION
|
|
This handler checks whether a group is one of the listed and adds an option
|
|
to the array if yes. Some other handler can record, for instance, all
|
|
groups and their options, not knowing in advance the names and amount of
|
|
groups.
|
|
|
|
RETURN
|
|
0 - ok
|
|
1 - error occured
|
|
*/
|
|
|
|
static int handle_default_option(void *in_ctx, const char *group_name,
|
|
const char *option)
|
|
{
|
|
char *tmp;
|
|
struct handle_option_ctx *ctx= (struct handle_option_ctx *) in_ctx;
|
|
|
|
if (!option)
|
|
return 0;
|
|
|
|
if (find_type((char *)group_name, ctx->group, 3))
|
|
{
|
|
if (!(tmp= alloc_root(ctx->alloc, strlen(option) + 1)))
|
|
return 1;
|
|
if (insert_dynamic(ctx->args, (uchar*) &tmp))
|
|
return 1;
|
|
strmov(tmp, option);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Gets options from the command line
|
|
|
|
SYNOPSIS
|
|
get_defaults_options()
|
|
argc Pointer to argc of original program
|
|
argv Pointer to argv of original program
|
|
defaults --defaults-file option
|
|
extra_defaults --defaults-extra-file option
|
|
|
|
RETURN
|
|
# Number of arguments used from *argv
|
|
defaults and extra_defaults will be set to option of the appropriate
|
|
items of argv array, or to NULL if there are no such options
|
|
*/
|
|
|
|
int get_defaults_options(int argc, char **argv,
|
|
char **defaults,
|
|
char **extra_defaults,
|
|
char **group_suffix)
|
|
{
|
|
int org_argc= argc, prev_argc= 0;
|
|
*defaults= *extra_defaults= *group_suffix= 0;
|
|
|
|
while (argc >= 2 && argc != prev_argc)
|
|
{
|
|
/* Skip program name or previously handled argument */
|
|
argv++;
|
|
prev_argc= argc; /* To check if we found */
|
|
if (!*defaults && is_prefix(*argv,"--defaults-file="))
|
|
{
|
|
*defaults= *argv + sizeof("--defaults-file=")-1;
|
|
argc--;
|
|
continue;
|
|
}
|
|
if (!*extra_defaults && is_prefix(*argv,"--defaults-extra-file="))
|
|
{
|
|
*extra_defaults= *argv + sizeof("--defaults-extra-file=")-1;
|
|
argc--;
|
|
continue;
|
|
}
|
|
if (!*group_suffix && is_prefix(*argv, "--defaults-group-suffix="))
|
|
{
|
|
*group_suffix= *argv + sizeof("--defaults-group-suffix=")-1;
|
|
argc--;
|
|
continue;
|
|
}
|
|
}
|
|
return org_argc - argc;
|
|
}
|
|
|
|
|
|
/*
|
|
Read options from configurations files
|
|
|
|
SYNOPSIS
|
|
load_defaults()
|
|
conf_file Basename for configuration file to search for.
|
|
If this is a path, then only this file is read.
|
|
groups Which [group] entrys to read.
|
|
Points to an null terminated array of pointers
|
|
argc Pointer to argc of original program
|
|
argv Pointer to argv of original program
|
|
|
|
IMPLEMENTATION
|
|
|
|
Read options from configuration files and put them BEFORE the arguments
|
|
that are already in argc and argv. This way the calling program can
|
|
easily command line options override options in configuration files
|
|
|
|
NOTES
|
|
In case of fatal error, the function will print a warning and do
|
|
exit(1)
|
|
|
|
To free used memory one should call free_defaults() with the argument
|
|
that was put in *argv
|
|
|
|
RETURN
|
|
0 ok
|
|
1 The given conf_file didn't exists
|
|
*/
|
|
|
|
|
|
int load_defaults(const char *conf_file, const char **groups,
|
|
int *argc, char ***argv)
|
|
{
|
|
DYNAMIC_ARRAY args;
|
|
TYPELIB group;
|
|
my_bool found_print_defaults= 0;
|
|
uint args_used= 0;
|
|
int error= 0;
|
|
MEM_ROOT alloc;
|
|
char *ptr,**res;
|
|
struct handle_option_ctx ctx;
|
|
DBUG_ENTER("load_defaults");
|
|
|
|
init_default_directories();
|
|
init_alloc_root(&alloc,512,0);
|
|
/*
|
|
Check if the user doesn't want any default option processing
|
|
--no-defaults is always the first option
|
|
*/
|
|
if (*argc >= 2 && !strcmp(argv[0][1],"--no-defaults"))
|
|
{
|
|
/* remove the --no-defaults argument and return only the other arguments */
|
|
uint i;
|
|
if (!(ptr=(char*) alloc_root(&alloc,sizeof(alloc)+
|
|
(*argc + 1)*sizeof(char*))))
|
|
goto err;
|
|
res= (char**) (ptr+sizeof(alloc));
|
|
res[0]= **argv; /* Copy program name */
|
|
for (i=2 ; i < (uint) *argc ; i++)
|
|
res[i-1]=argv[0][i];
|
|
res[i-1]=0; /* End pointer */
|
|
(*argc)--;
|
|
*argv=res;
|
|
*(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
group.count=0;
|
|
group.name= "defaults";
|
|
group.type_names= groups;
|
|
|
|
for (; *groups ; groups++)
|
|
group.count++;
|
|
|
|
if (my_init_dynamic_array(&args, sizeof(char*),*argc, 32))
|
|
goto err;
|
|
|
|
ctx.alloc= &alloc;
|
|
ctx.args= &args;
|
|
ctx.group= &group;
|
|
|
|
error= my_search_option_files(conf_file, argc, argv, &args_used,
|
|
handle_default_option, (void *) &ctx);
|
|
/*
|
|
Here error contains <> 0 only if we have a fully specified conf_file
|
|
or a forced default file
|
|
*/
|
|
if (!(ptr=(char*) alloc_root(&alloc,sizeof(alloc)+
|
|
(args.elements + *argc +1) *sizeof(char*))))
|
|
goto err;
|
|
res= (char**) (ptr+sizeof(alloc));
|
|
|
|
/* copy name + found arguments + command line arguments to new array */
|
|
res[0]= argv[0][0]; /* Name MUST be set, even by embedded library */
|
|
memcpy((uchar*) (res+1), args.buffer, args.elements*sizeof(char*));
|
|
/* Skip --defaults-xxx options */
|
|
(*argc)-= args_used;
|
|
(*argv)+= args_used;
|
|
|
|
/*
|
|
Check if we wan't to see the new argument list
|
|
This options must always be the last of the default options
|
|
*/
|
|
if (*argc >= 2 && !strcmp(argv[0][1],"--print-defaults"))
|
|
{
|
|
found_print_defaults=1;
|
|
--*argc; ++*argv; /* skip argument */
|
|
}
|
|
|
|
if (*argc)
|
|
memcpy((uchar*) (res+1+args.elements), (char*) ((*argv)+1),
|
|
(*argc-1)*sizeof(char*));
|
|
res[args.elements+ *argc]=0; /* last null */
|
|
|
|
(*argc)+=args.elements;
|
|
*argv= (char**) res;
|
|
*(MEM_ROOT*) ptr= alloc; /* Save alloc root for free */
|
|
delete_dynamic(&args);
|
|
if (found_print_defaults)
|
|
{
|
|
int i;
|
|
printf("%s would have been started with the following arguments:\n",
|
|
**argv);
|
|
for (i=1 ; i < *argc ; i++)
|
|
printf("%s ", (*argv)[i]);
|
|
puts("");
|
|
exit(0);
|
|
}
|
|
DBUG_RETURN(error);
|
|
|
|
err:
|
|
fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
|
|
exit(1);
|
|
return 0; /* Keep compiler happy */
|
|
}
|
|
|
|
|
|
void free_defaults(char **argv)
|
|
{
|
|
MEM_ROOT ptr;
|
|
memcpy_fixed((char*) &ptr,(char *) argv - sizeof(ptr), sizeof(ptr));
|
|
free_root(&ptr,MYF(0));
|
|
}
|
|
|
|
|
|
static int search_default_file(Process_option_func opt_handler,
|
|
void *handler_ctx,
|
|
const char *dir,
|
|
const char *config_file)
|
|
{
|
|
char **ext;
|
|
const char *empty_list[]= { "", 0 };
|
|
my_bool have_ext= fn_ext(config_file)[0] != 0;
|
|
const char **exts_to_use= have_ext ? empty_list : f_extensions;
|
|
|
|
for (ext= (char**) exts_to_use; *ext; ext++)
|
|
{
|
|
int error;
|
|
if ((error= search_default_file_with_ext(opt_handler, handler_ctx,
|
|
dir, *ext,
|
|
config_file, 0)) < 0)
|
|
return error;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Skip over keyword and get argument after keyword
|
|
|
|
SYNOPSIS
|
|
get_argument()
|
|
keyword Include directive keyword
|
|
kwlen Length of keyword
|
|
ptr Pointer to the keword in the line under process
|
|
line line number
|
|
|
|
RETURN
|
|
0 error
|
|
# Returns pointer to the argument after the keyword.
|
|
*/
|
|
|
|
static char *get_argument(const char *keyword, size_t kwlen,
|
|
char *ptr, char *name, uint line)
|
|
{
|
|
char *end;
|
|
|
|
/* Skip over "include / includedir keyword" and following whitespace */
|
|
|
|
for (ptr+= kwlen - 1;
|
|
my_isspace(&my_charset_latin1, ptr[0]);
|
|
ptr++)
|
|
{}
|
|
|
|
/*
|
|
Trim trailing whitespace from directory name
|
|
The -1 below is for the newline added by fgets()
|
|
Note that my_isspace() is true for \r and \n
|
|
*/
|
|
for (end= ptr + strlen(ptr) - 1;
|
|
my_isspace(&my_charset_latin1, *(end - 1));
|
|
end--)
|
|
{}
|
|
end[0]= 0; /* Cut off end space */
|
|
|
|
/* Print error msg if there is nothing after !include* directive */
|
|
if (end <= ptr)
|
|
{
|
|
fprintf(stderr,
|
|
"error: Wrong '!%s' directive in config file: %s at line %d\n",
|
|
keyword, name, line);
|
|
return 0;
|
|
}
|
|
return ptr;
|
|
}
|
|
|
|
|
|
/*
|
|
Open a configuration file (if exists) and read given options from it
|
|
|
|
SYNOPSIS
|
|
search_default_file_with_ext()
|
|
opt_handler Option handler function. It is used to process
|
|
every separate option.
|
|
handler_ctx Pointer to the structure to store actual
|
|
parameters of the function.
|
|
dir directory to read
|
|
ext Extension for configuration file
|
|
config_file Name of configuration file
|
|
group groups to read
|
|
recursion_level the level of recursion, got while processing
|
|
"!include" or "!includedir"
|
|
|
|
RETURN
|
|
0 Success
|
|
-1 Fatal error, abort
|
|
1 File not found (Warning)
|
|
*/
|
|
|
|
static int search_default_file_with_ext(Process_option_func opt_handler,
|
|
void *handler_ctx,
|
|
const char *dir,
|
|
const char *ext,
|
|
const char *config_file,
|
|
int recursion_level)
|
|
{
|
|
char name[FN_REFLEN + 10], buff[4096], curr_gr[4096], *ptr, *end, **tmp_ext;
|
|
char *value, option[4096], tmp[FN_REFLEN];
|
|
static const char includedir_keyword[]= "includedir";
|
|
static const char include_keyword[]= "include";
|
|
const int max_recursion_level= 10;
|
|
FILE *fp;
|
|
uint line=0;
|
|
my_bool found_group=0;
|
|
uint i;
|
|
MY_DIR *search_dir;
|
|
FILEINFO *search_file;
|
|
|
|
if ((dir ? strlen(dir) : 0 )+strlen(config_file) >= FN_REFLEN-3)
|
|
return 0; /* Ignore wrong paths */
|
|
if (dir)
|
|
{
|
|
end=convert_dirname(name, dir, NullS);
|
|
if (dir[0] == FN_HOMELIB) /* Add . to filenames in home */
|
|
*end++='.';
|
|
strxmov(end,config_file,ext,NullS);
|
|
}
|
|
else
|
|
{
|
|
strmov(name,config_file);
|
|
}
|
|
fn_format(name,name,"","",4);
|
|
#if !defined(__WIN__) && !defined(__NETWARE__)
|
|
{
|
|
MY_STAT stat_info;
|
|
if (!my_stat(name,&stat_info,MYF(0)))
|
|
return 1;
|
|
/*
|
|
Ignore world-writable regular files.
|
|
This is mainly done to protect us to not read a file created by
|
|
the mysqld server, but the check is still valid in most context.
|
|
*/
|
|
if ((stat_info.st_mode & S_IWOTH) &&
|
|
(stat_info.st_mode & S_IFMT) == S_IFREG)
|
|
{
|
|
fprintf(stderr, "Warning: World-writable config file '%s' is ignored\n",
|
|
name);
|
|
return 0;
|
|
}
|
|
}
|
|
#endif
|
|
if (!(fp= my_fopen(name, O_RDONLY, MYF(0))))
|
|
return 1; /* Ignore wrong files */
|
|
|
|
while (fgets(buff, sizeof(buff) - 1, fp))
|
|
{
|
|
line++;
|
|
/* Ignore comment and empty lines */
|
|
for (ptr= buff; my_isspace(&my_charset_latin1, *ptr); ptr++)
|
|
{}
|
|
|
|
if (*ptr == '#' || *ptr == ';' || !*ptr)
|
|
continue;
|
|
|
|
/* Configuration File Directives */
|
|
if ((*ptr == '!'))
|
|
{
|
|
if (recursion_level >= max_recursion_level)
|
|
{
|
|
for (end= ptr + strlen(ptr) - 1;
|
|
my_isspace(&my_charset_latin1, *(end - 1));
|
|
end--)
|
|
{}
|
|
end[0]= 0;
|
|
fprintf(stderr,
|
|
"Warning: skipping '%s' directive as maximum include"
|
|
"recursion level was reached in file %s at line %d\n",
|
|
ptr, name, line);
|
|
continue;
|
|
}
|
|
|
|
/* skip over `!' and following whitespace */
|
|
for (++ptr; my_isspace(&my_charset_latin1, ptr[0]); ptr++)
|
|
{}
|
|
|
|
if ((!strncmp(ptr, includedir_keyword,
|
|
sizeof(includedir_keyword) - 1)) &&
|
|
my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1]))
|
|
{
|
|
if (!(ptr= get_argument(includedir_keyword,
|
|
sizeof(includedir_keyword),
|
|
ptr, name, line)))
|
|
goto err;
|
|
|
|
if (!(search_dir= my_dir(ptr, MYF(MY_WME))))
|
|
goto err;
|
|
|
|
for (i= 0; i < (uint) search_dir->number_off_files; i++)
|
|
{
|
|
search_file= search_dir->dir_entry + i;
|
|
ext= fn_ext(search_file->name);
|
|
|
|
/* check extension */
|
|
for (tmp_ext= (char**) f_extensions; *tmp_ext; tmp_ext++)
|
|
{
|
|
if (!strcmp(ext, *tmp_ext))
|
|
break;
|
|
}
|
|
|
|
if (*tmp_ext)
|
|
{
|
|
fn_format(tmp, search_file->name, ptr, "",
|
|
MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
search_default_file_with_ext(opt_handler, handler_ctx, "", "", tmp,
|
|
recursion_level + 1);
|
|
}
|
|
}
|
|
|
|
my_dirend(search_dir);
|
|
}
|
|
else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1)) &&
|
|
my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword)-1]))
|
|
{
|
|
if (!(ptr= get_argument(include_keyword,
|
|
sizeof(include_keyword), ptr,
|
|
name, line)))
|
|
goto err;
|
|
|
|
search_default_file_with_ext(opt_handler, handler_ctx, "", "", ptr,
|
|
recursion_level + 1);
|
|
}
|
|
|
|
continue;
|
|
}
|
|
|
|
if (*ptr == '[') /* Group name */
|
|
{
|
|
found_group=1;
|
|
if (!(end=(char *) strchr(++ptr,']')))
|
|
{
|
|
fprintf(stderr,
|
|
"error: Wrong group definition in config file: %s at line %d\n",
|
|
name,line);
|
|
goto err;
|
|
}
|
|
/* Remove end space */
|
|
for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;
|
|
end[0]=0;
|
|
|
|
strmake(curr_gr, ptr, min((size_t) (end-ptr)+1, sizeof(curr_gr)-1));
|
|
|
|
/* signal that a new group is found */
|
|
opt_handler(handler_ctx, curr_gr, NULL);
|
|
|
|
continue;
|
|
}
|
|
if (!found_group)
|
|
{
|
|
fprintf(stderr,
|
|
"error: Found option without preceding group in config file: %s at line: %d\n",
|
|
name,line);
|
|
goto err;
|
|
}
|
|
|
|
|
|
end= remove_end_comment(ptr);
|
|
if ((value= strchr(ptr, '=')))
|
|
end= value; /* Option without argument */
|
|
for ( ; my_isspace(&my_charset_latin1,end[-1]) ; end--) ;
|
|
if (!value)
|
|
{
|
|
strmake(strmov(option,"--"),ptr, (size_t) (end-ptr));
|
|
if (opt_handler(handler_ctx, curr_gr, option))
|
|
goto err;
|
|
}
|
|
else
|
|
{
|
|
/* Remove pre- and end space */
|
|
char *value_end;
|
|
for (value++ ; my_isspace(&my_charset_latin1,*value); value++) ;
|
|
value_end=strend(value);
|
|
/*
|
|
We don't have to test for value_end >= value as we know there is
|
|
an '=' before
|
|
*/
|
|
for ( ; my_isspace(&my_charset_latin1,value_end[-1]) ; value_end--) ;
|
|
if (value_end < value) /* Empty string */
|
|
value_end=value;
|
|
|
|
/* remove quotes around argument */
|
|
if ((*value == '\"' || *value == '\'') && /* First char is quote */
|
|
(value + 1 < value_end ) && /* String is longer than 1 */
|
|
*value == value_end[-1] ) /* First char is equal to last char */
|
|
{
|
|
value++;
|
|
value_end--;
|
|
}
|
|
ptr=strnmov(strmov(option,"--"),ptr,(size_t) (end-ptr));
|
|
*ptr++= '=';
|
|
|
|
for ( ; value != value_end; value++)
|
|
{
|
|
if (*value == '\\' && value != value_end-1)
|
|
{
|
|
switch(*++value) {
|
|
case 'n':
|
|
*ptr++='\n';
|
|
break;
|
|
case 't':
|
|
*ptr++= '\t';
|
|
break;
|
|
case 'r':
|
|
*ptr++ = '\r';
|
|
break;
|
|
case 'b':
|
|
*ptr++ = '\b';
|
|
break;
|
|
case 's':
|
|
*ptr++= ' '; /* space */
|
|
break;
|
|
case '\"':
|
|
*ptr++= '\"';
|
|
break;
|
|
case '\'':
|
|
*ptr++= '\'';
|
|
break;
|
|
case '\\':
|
|
*ptr++= '\\';
|
|
break;
|
|
default: /* Unknown; Keep '\' */
|
|
*ptr++= '\\';
|
|
*ptr++= *value;
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
*ptr++= *value;
|
|
}
|
|
*ptr=0;
|
|
if (opt_handler(handler_ctx, curr_gr, option))
|
|
goto err;
|
|
}
|
|
}
|
|
my_fclose(fp,MYF(0));
|
|
return(0);
|
|
|
|
err:
|
|
my_fclose(fp,MYF(0));
|
|
return -1; /* Fatal error */
|
|
}
|
|
|
|
|
|
static char *remove_end_comment(char *ptr)
|
|
{
|
|
char quote= 0; /* we are inside quote marks */
|
|
char escape= 0; /* symbol is protected by escape chagacter */
|
|
|
|
for (; *ptr; ptr++)
|
|
{
|
|
if ((*ptr == '\'' || *ptr == '\"') && !escape)
|
|
{
|
|
if (!quote)
|
|
quote= *ptr;
|
|
else if (quote == *ptr)
|
|
quote= 0;
|
|
}
|
|
/* We are not inside a string */
|
|
if (!quote && *ptr == '#')
|
|
{
|
|
*ptr= 0;
|
|
return ptr;
|
|
}
|
|
escape= (quote && *ptr == '\\' && !escape);
|
|
}
|
|
return ptr;
|
|
}
|
|
|
|
#include <help_start.h>
|
|
|
|
void my_print_default_files(const char *conf_file)
|
|
{
|
|
const char *empty_list[]= { "", 0 };
|
|
my_bool have_ext= fn_ext(conf_file)[0] != 0;
|
|
const char **exts_to_use= have_ext ? empty_list : f_extensions;
|
|
char name[FN_REFLEN], **ext;
|
|
const char **dirs;
|
|
|
|
init_default_directories();
|
|
puts("\nDefault options are read from the following files in the given order:");
|
|
|
|
if (dirname_length(conf_file))
|
|
fputs(conf_file,stdout);
|
|
else
|
|
{
|
|
for (dirs=default_directories ; *dirs; dirs++)
|
|
{
|
|
for (ext= (char**) exts_to_use; *ext; ext++)
|
|
{
|
|
const char *pos;
|
|
char *end;
|
|
if (**dirs)
|
|
pos= *dirs;
|
|
else if (my_defaults_extra_file)
|
|
pos= my_defaults_extra_file;
|
|
else
|
|
continue;
|
|
end= convert_dirname(name, pos, NullS);
|
|
if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
|
|
*end++='.';
|
|
strxmov(end, conf_file, *ext, " ", NullS);
|
|
fputs(name,stdout);
|
|
}
|
|
}
|
|
}
|
|
puts("");
|
|
}
|
|
|
|
void print_defaults(const char *conf_file, const char **groups)
|
|
{
|
|
const char **groups_save= groups;
|
|
my_print_default_files(conf_file);
|
|
|
|
fputs("The following groups are read:",stdout);
|
|
for ( ; *groups ; groups++)
|
|
{
|
|
fputc(' ',stdout);
|
|
fputs(*groups,stdout);
|
|
}
|
|
|
|
if (my_defaults_group_suffix)
|
|
{
|
|
groups= groups_save;
|
|
for ( ; *groups ; groups++)
|
|
{
|
|
fputc(' ',stdout);
|
|
fputs(*groups,stdout);
|
|
fputs(my_defaults_group_suffix,stdout);
|
|
}
|
|
}
|
|
puts("\nThe following options may be given as the first argument:\n\
|
|
--print-defaults Print the program argument list and exit\n\
|
|
--no-defaults Don't read default options from any options file\n\
|
|
--defaults-file=# Only read default options from the given file #\n\
|
|
--defaults-extra-file=# Read this file after the global files are read");
|
|
}
|
|
|
|
#include <help_end.h>
|
|
|
|
|
|
#ifdef __WIN__
|
|
/*
|
|
This wrapper for GetSystemWindowsDirectory() will dynamically bind to the
|
|
function if it is available, emulate it on NT4 Terminal Server by stripping
|
|
the \SYSTEM32 from the end of the results of GetSystemDirectory(), or just
|
|
return GetSystemDirectory().
|
|
*/
|
|
|
|
typedef UINT (WINAPI *GET_SYSTEM_WINDOWS_DIRECTORY)(LPSTR, UINT);
|
|
|
|
static size_t my_get_system_windows_directory(char *buffer, size_t size)
|
|
{
|
|
size_t count;
|
|
GET_SYSTEM_WINDOWS_DIRECTORY
|
|
func_ptr= (GET_SYSTEM_WINDOWS_DIRECTORY)
|
|
GetProcAddress(GetModuleHandle("kernel32.dll"),
|
|
"GetSystemWindowsDirectoryA");
|
|
|
|
if (func_ptr)
|
|
return func_ptr(buffer, size);
|
|
|
|
/*
|
|
Windows NT 4.0 Terminal Server Edition:
|
|
To retrieve the shared Windows directory, call GetSystemDirectory and
|
|
trim the "System32" element from the end of the returned path.
|
|
*/
|
|
count= GetSystemDirectory(buffer, size);
|
|
if (count > 8 && stricmp(buffer+(count-8), "\\System32") == 0)
|
|
{
|
|
count-= 8;
|
|
buffer[count] = '\0';
|
|
}
|
|
return count;
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
Create the list of default directories.
|
|
|
|
On Microsoft Windows, this is:
|
|
1. C:/
|
|
2. GetWindowsDirectory()
|
|
3. GetSystemWindowsDirectory()
|
|
4. getenv(DEFAULT_HOME_ENV)
|
|
5. Directory above where the executable is located
|
|
6. ""
|
|
7. --sysconfdir=<path>
|
|
|
|
On Novell NetWare, this is:
|
|
1. sys:/etc/
|
|
2. getenv(DEFAULT_HOME_ENV)
|
|
3. ""
|
|
4. --sysconfdir=<path>
|
|
|
|
On OS/2, this is:
|
|
1. getenv(ETC)
|
|
2. /etc/
|
|
3. getenv(DEFAULT_HOME_ENV)
|
|
4. ""
|
|
5. "~/"
|
|
6. --sysconfdir=<path>
|
|
|
|
Everywhere else, this is:
|
|
1. /etc/
|
|
2. /etc/mysql/
|
|
3. getenv(DEFAULT_HOME_ENV)
|
|
4. ""
|
|
5. "~/"
|
|
6. --sysconfdir=<path>
|
|
|
|
*/
|
|
|
|
static void init_default_directories()
|
|
{
|
|
const char *env, **ptr= default_directories;
|
|
|
|
#ifdef __WIN__
|
|
*ptr++= "C:/";
|
|
|
|
if (GetWindowsDirectory(system_dir,sizeof(system_dir)))
|
|
*ptr++= (char*)&system_dir;
|
|
if (my_get_system_windows_directory(shared_system_dir,
|
|
sizeof(shared_system_dir)) &&
|
|
strcmp(system_dir, shared_system_dir))
|
|
*ptr++= (char *)&shared_system_dir;
|
|
|
|
#elif defined(__NETWARE__)
|
|
*ptr++= "sys:/etc/";
|
|
#else
|
|
*ptr++= "/etc/";
|
|
*ptr++= "/etc/mysql/";
|
|
#endif
|
|
if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
|
|
*ptr++= env;
|
|
*ptr++= ""; /* Place for defaults_extra_file */
|
|
#if !defined(__WIN__) && !defined(__NETWARE__)
|
|
*ptr++= "~/";;
|
|
#elif defined(__WIN__)
|
|
if (GetModuleFileName(NULL, config_dir, sizeof(config_dir)))
|
|
{
|
|
char *last= NULL, *end= strend(config_dir);
|
|
/*
|
|
Look for the second-to-last \ in the filename, but hang on
|
|
to a pointer after the last \ in case we're in the root of
|
|
a drive.
|
|
*/
|
|
for ( ; end > config_dir; end--)
|
|
{
|
|
if (*end == FN_LIBCHAR)
|
|
{
|
|
if (last)
|
|
{
|
|
if (end != config_dir)
|
|
{
|
|
/* Keep the last '\' as this works both with D:\ and a directory */
|
|
end[1]= 0;
|
|
}
|
|
else
|
|
{
|
|
/* No parent directory (strange). Use current dir + '\' */
|
|
last[1]= 0;
|
|
}
|
|
break;
|
|
}
|
|
last= end;
|
|
}
|
|
}
|
|
*ptr++= (char *)&config_dir;
|
|
}
|
|
#endif
|
|
#ifdef DEFAULT_SYSCONFDIR
|
|
if (DEFAULT_SYSCONFDIR != "")
|
|
*ptr++= DEFAULT_SYSCONFDIR;
|
|
#endif
|
|
*ptr= 0; /* end marker */
|
|
}
|