mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +01:00
f252f9248a
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
495 lines
13 KiB
C
495 lines
13 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; 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 */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif
|
|
#ifdef VMS
|
|
#include <rms.h>
|
|
#include <iodef.h>
|
|
#include <descrip.h>
|
|
#endif /* VMS */
|
|
|
|
static char * NEAR_F expand_tilde(char * *path);
|
|
|
|
/* Pack a dirname ; Changes HOME to ~/ and current dev to ./ */
|
|
/* from is a dirname (from dirname() ?) ending with FN_LIBCHAR */
|
|
/* to may be == from */
|
|
|
|
void pack_dirname(char * to, const char *from)
|
|
{
|
|
int cwd_err;
|
|
size_t d_length,length,buff_length;
|
|
char * start;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("pack_dirname");
|
|
|
|
LINT_INIT(buff_length);
|
|
(void) intern_filename(to,from); /* Change to intern name */
|
|
|
|
#ifdef FN_DEVCHAR
|
|
if ((start=strrchr(to,FN_DEVCHAR)) != 0) /* Skip device part */
|
|
start++;
|
|
else
|
|
#endif
|
|
start=to;
|
|
|
|
if (!(cwd_err= my_getwd(buff,FN_REFLEN,MYF(0))))
|
|
{
|
|
buff_length= strlen(buff);
|
|
d_length= (size_t) (start-to);
|
|
if ((start == to ||
|
|
(buff_length == d_length && !bcmp(buff,start,d_length))) &&
|
|
*start != FN_LIBCHAR && *start)
|
|
{ /* Put current dir before */
|
|
bchange(to,d_length,buff,buff_length,strlen(to)+1);
|
|
}
|
|
}
|
|
|
|
if ((d_length= cleanup_dirname(to,to)) != 0)
|
|
{
|
|
length=0;
|
|
if (home_dir)
|
|
{
|
|
length= strlen(home_dir);
|
|
if (home_dir[length-1] == FN_LIBCHAR)
|
|
length--; /* Don't test last '/' */
|
|
}
|
|
if (length > 1 && length < d_length)
|
|
{ /* test if /xx/yy -> ~/yy */
|
|
if (bcmp(to,home_dir,length) == 0 && to[length] == FN_LIBCHAR)
|
|
{
|
|
to[0]=FN_HOMELIB; /* Filename begins with ~ */
|
|
(void) strmov_overlapp(to+1,to+length);
|
|
}
|
|
}
|
|
if (! cwd_err)
|
|
{ /* Test if cwd is ~/... */
|
|
if (length > 1 && length < buff_length)
|
|
{
|
|
if (bcmp(buff,home_dir,length) == 0 && buff[length] == FN_LIBCHAR)
|
|
{
|
|
buff[0]=FN_HOMELIB;
|
|
(void) strmov_overlapp(buff+1,buff+length);
|
|
}
|
|
}
|
|
if (is_prefix(to,buff))
|
|
{
|
|
length= strlen(buff);
|
|
if (to[length])
|
|
(void) strmov_overlapp(to,to+length); /* Remove everything before */
|
|
else
|
|
{
|
|
to[0]= FN_CURLIB; /* Put ./ instead of cwd */
|
|
to[1]= FN_LIBCHAR;
|
|
to[2]= '\0';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
DBUG_PRINT("exit",("to: '%s'",to));
|
|
DBUG_VOID_RETURN;
|
|
} /* pack_dirname */
|
|
|
|
|
|
/*
|
|
remove unwanted chars from dirname
|
|
|
|
SYNOPSIS
|
|
cleanup_dirname()
|
|
to Store result here
|
|
from Dirname to fix. May be same as to
|
|
|
|
IMPLEMENTATION
|
|
"/../" removes prev dir
|
|
"/~/" removes all before ~
|
|
//" is same as "/", except on Win32 at start of a file
|
|
"/./" is removed
|
|
Unpacks home_dir if "~/.." used
|
|
Unpacks current dir if if "./.." used
|
|
|
|
RETURN
|
|
# length of new name
|
|
*/
|
|
|
|
size_t cleanup_dirname(register char *to, const char *from)
|
|
{
|
|
reg5 size_t length;
|
|
reg2 char * pos;
|
|
reg3 char * from_ptr;
|
|
reg4 char * start;
|
|
char parent[5], /* for "FN_PARENTDIR" */
|
|
buff[FN_REFLEN+1],*end_parentdir;
|
|
#ifdef BACKSLASH_MBTAIL
|
|
CHARSET_INFO *fs= fs_character_set();
|
|
#endif
|
|
DBUG_ENTER("cleanup_dirname");
|
|
DBUG_PRINT("enter",("from: '%s'",from));
|
|
|
|
start=buff;
|
|
from_ptr=(char *) from;
|
|
#ifdef FN_DEVCHAR
|
|
if ((pos=strrchr(from_ptr,FN_DEVCHAR)) != 0)
|
|
{ /* Skip device part */
|
|
length=(size_t) (pos-from_ptr)+1;
|
|
start=strnmov(buff,from_ptr,length); from_ptr+=length;
|
|
}
|
|
#endif
|
|
|
|
parent[0]=FN_LIBCHAR;
|
|
length=(size_t) (strmov(parent+1,FN_PARENTDIR)-parent);
|
|
for (pos=start ; (*pos= *from_ptr++) != 0 ; pos++)
|
|
{
|
|
#ifdef BACKSLASH_MBTAIL
|
|
uint l;
|
|
if (use_mb(fs) && (l= my_ismbchar(fs, from_ptr - 1, from_ptr + 2)))
|
|
{
|
|
for (l-- ; l ; *++pos= *from_ptr++, l--);
|
|
start= pos + 1; /* Don't look inside multi-byte char */
|
|
continue;
|
|
}
|
|
#endif
|
|
if (*pos == '/')
|
|
*pos = FN_LIBCHAR;
|
|
if (*pos == FN_LIBCHAR)
|
|
{
|
|
if ((size_t) (pos-start) > length && bcmp(pos-length,parent,length) == 0)
|
|
{ /* If .../../; skip prev */
|
|
pos-=length;
|
|
if (pos != start)
|
|
{ /* not /../ */
|
|
pos--;
|
|
if (*pos == FN_HOMELIB && (pos == start || pos[-1] == FN_LIBCHAR))
|
|
{
|
|
if (!home_dir)
|
|
{
|
|
pos+=length+1; /* Don't unpack ~/.. */
|
|
continue;
|
|
}
|
|
pos=strmov(buff,home_dir)-1; /* Unpacks ~/.. */
|
|
if (*pos == FN_LIBCHAR)
|
|
pos--; /* home ended with '/' */
|
|
}
|
|
if (*pos == FN_CURLIB && (pos == start || pos[-1] == FN_LIBCHAR))
|
|
{
|
|
if (my_getwd(curr_dir,FN_REFLEN,MYF(0)))
|
|
{
|
|
pos+=length+1; /* Don't unpack ./.. */
|
|
continue;
|
|
}
|
|
pos=strmov(buff,curr_dir)-1; /* Unpacks ./.. */
|
|
if (*pos == FN_LIBCHAR)
|
|
pos--; /* home ended with '/' */
|
|
}
|
|
end_parentdir=pos;
|
|
while (pos >= start && *pos != FN_LIBCHAR) /* remove prev dir */
|
|
pos--;
|
|
if (pos[1] == FN_HOMELIB || bcmp(pos,parent,length) == 0)
|
|
{ /* Don't remove ~user/ */
|
|
pos=strmov(end_parentdir+1,parent);
|
|
*pos=FN_LIBCHAR;
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
else if ((size_t) (pos-start) == length-1 &&
|
|
!bcmp(start,parent+1,length-1))
|
|
start=pos; /* Starts with "../" */
|
|
else if (pos-start > 0 && pos[-1] == FN_LIBCHAR)
|
|
{
|
|
#ifdef FN_NETWORK_DRIVES
|
|
if (pos-start != 1)
|
|
#endif
|
|
pos--; /* Remove dupplicate '/' */
|
|
}
|
|
else if (pos-start > 1 && pos[-1] == FN_CURLIB && pos[-2] == FN_LIBCHAR)
|
|
pos-=2; /* Skip /./ */
|
|
else if (pos > buff+1 && pos[-1] == FN_HOMELIB && pos[-2] == FN_LIBCHAR)
|
|
{ /* Found ..../~/ */
|
|
buff[0]=FN_HOMELIB;
|
|
buff[1]=FN_LIBCHAR;
|
|
start=buff; pos=buff+1;
|
|
}
|
|
}
|
|
}
|
|
(void) strmov(to,buff);
|
|
DBUG_PRINT("exit",("to: '%s'",to));
|
|
DBUG_RETURN((size_t) (pos-buff));
|
|
} /* cleanup_dirname */
|
|
|
|
|
|
/*
|
|
On system where you don't have symbolic links, the following
|
|
code will allow you to create a file:
|
|
directory-name.sym that should contain the real path
|
|
to the directory. This will be used if the directory name
|
|
doesn't exists
|
|
*/
|
|
|
|
|
|
my_bool my_use_symdir=0; /* Set this if you want to use symdirs */
|
|
|
|
#ifdef USE_SYMDIR
|
|
void symdirget(char *dir)
|
|
{
|
|
char buff[FN_REFLEN];
|
|
char *pos=strend(dir);
|
|
if (dir[0] && pos[-1] != FN_DEVCHAR && my_access(dir, F_OK))
|
|
{
|
|
File file;
|
|
size_t length;
|
|
char temp= *(--pos); /* May be "/" or "\" */
|
|
strmov(pos,".sym");
|
|
file= my_open(dir, O_RDONLY, MYF(0));
|
|
*pos++=temp; *pos=0; /* Restore old filename */
|
|
if (file >= 0)
|
|
{
|
|
if ((length= my_read(file, buff, sizeof(buff), MYF(0))) > 0)
|
|
{
|
|
for (pos= buff + length ;
|
|
pos > buff && (iscntrl(pos[-1]) || isspace(pos[-1])) ;
|
|
pos --);
|
|
|
|
/* Ensure that the symlink ends with the directory symbol */
|
|
if (pos == buff || pos[-1] != FN_LIBCHAR)
|
|
*pos++=FN_LIBCHAR;
|
|
|
|
strmake(dir,buff, (size_t) (pos-buff));
|
|
}
|
|
my_close(file, MYF(0));
|
|
}
|
|
}
|
|
}
|
|
#endif /* USE_SYMDIR */
|
|
|
|
|
|
/*
|
|
Fixes a directroy name so that can be used by open()
|
|
|
|
SYNOPSIS
|
|
unpack_dirname()
|
|
to Store result here. May be = from
|
|
from 'Packed' directory name (may contain ~)
|
|
|
|
IMPLEMENTATION
|
|
Make that last char of to is '/' if from not empty and
|
|
from doesn't end in FN_DEVCHAR
|
|
Uses cleanup_dirname and changes ~/.. to home_dir/..
|
|
|
|
Changes a UNIX filename to system filename (replaces / with \ on windows)
|
|
|
|
RETURN
|
|
Length of new directory name (= length of to)
|
|
*/
|
|
|
|
size_t unpack_dirname(char * to, const char *from)
|
|
{
|
|
size_t length, h_length;
|
|
char buff[FN_REFLEN+1+4],*suffix,*tilde_expansion;
|
|
DBUG_ENTER("unpack_dirname");
|
|
|
|
(void) intern_filename(buff,from); /* Change to intern name */
|
|
length= strlen(buff); /* Fix that '/' is last */
|
|
if (length &&
|
|
#ifdef FN_DEVCHAR
|
|
buff[length-1] != FN_DEVCHAR &&
|
|
#endif
|
|
buff[length-1] != FN_LIBCHAR && buff[length-1] != '/')
|
|
{
|
|
buff[length]=FN_LIBCHAR;
|
|
buff[length+1]= '\0';
|
|
}
|
|
|
|
length=cleanup_dirname(buff,buff);
|
|
if (buff[0] == FN_HOMELIB)
|
|
{
|
|
suffix=buff+1; tilde_expansion=expand_tilde(&suffix);
|
|
if (tilde_expansion)
|
|
{
|
|
length-= (size_t) (suffix-buff)-1;
|
|
if (length+(h_length= strlen(tilde_expansion)) <= FN_REFLEN)
|
|
{
|
|
if (tilde_expansion[h_length-1] == FN_LIBCHAR)
|
|
h_length--;
|
|
if (buff+h_length < suffix)
|
|
bmove(buff+h_length,suffix,length);
|
|
else
|
|
bmove_upp(buff+h_length+length,suffix+length,length);
|
|
bmove(buff,tilde_expansion,h_length);
|
|
}
|
|
}
|
|
}
|
|
#ifdef USE_SYMDIR
|
|
if (my_use_symdir)
|
|
symdirget(buff);
|
|
#endif
|
|
DBUG_RETURN(system_filename(to,buff)); /* Fix for open */
|
|
} /* unpack_dirname */
|
|
|
|
|
|
/* Expand tilde to home or user-directory */
|
|
/* Path is reset to point at FN_LIBCHAR after ~xxx */
|
|
|
|
static char * NEAR_F expand_tilde(char * *path)
|
|
{
|
|
if (path[0][0] == FN_LIBCHAR)
|
|
return home_dir; /* ~/ expanded to home */
|
|
#ifdef HAVE_GETPWNAM
|
|
{
|
|
char *str,save;
|
|
struct passwd *user_entry;
|
|
|
|
if (!(str=strchr(*path,FN_LIBCHAR)))
|
|
str=strend(*path);
|
|
save= *str; *str= '\0';
|
|
user_entry=getpwnam(*path);
|
|
*str=save;
|
|
endpwent();
|
|
if (user_entry)
|
|
{
|
|
*path=str;
|
|
return user_entry->pw_dir;
|
|
}
|
|
}
|
|
#endif
|
|
return (char *) 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Fix filename so it can be used by open, create
|
|
|
|
SYNOPSIS
|
|
unpack_filename()
|
|
to Store result here. Must be at least of size FN_REFLEN.
|
|
from Filename in unix format (with ~)
|
|
|
|
RETURN
|
|
# length of to
|
|
|
|
NOTES
|
|
to may be == from
|
|
~ will only be expanded if total length < FN_REFLEN
|
|
*/
|
|
|
|
|
|
size_t unpack_filename(char * to, const char *from)
|
|
{
|
|
size_t length, n_length, buff_length;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("unpack_filename");
|
|
|
|
length=dirname_part(buff, from, &buff_length);/* copy & convert dirname */
|
|
n_length=unpack_dirname(buff,buff);
|
|
if (n_length+strlen(from+length) < FN_REFLEN)
|
|
{
|
|
(void) strmov(buff+n_length,from+length);
|
|
length= system_filename(to,buff); /* Fix to usably filename */
|
|
}
|
|
else
|
|
length= system_filename(to,from); /* Fix to usably filename */
|
|
DBUG_RETURN(length);
|
|
} /* unpack_filename */
|
|
|
|
|
|
/* Convert filename (unix standard) to system standard */
|
|
/* Used before system command's like open(), create() .. */
|
|
/* Returns length of to */
|
|
|
|
size_t system_filename(char * to, const char *from)
|
|
{
|
|
#ifndef FN_C_BEFORE_DIR
|
|
return (size_t) (strmake(to,from,FN_REFLEN-1)-to);
|
|
#else /* VMS */
|
|
|
|
/* change 'dev:lib/xxx' to 'dev:[lib]xxx' */
|
|
/* change 'dev:xxx' to 'dev:xxx' */
|
|
/* change './xxx' to 'xxx' */
|
|
/* change './lib/' or lib/ to '[.lib]' */
|
|
/* change '/x/y/z to '[x.y]x' */
|
|
/* change 'dev:/x' to 'dev:[000000]x' */
|
|
|
|
int libchar_found;
|
|
size_t length;
|
|
char * to_pos,from_pos,pos;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("system_filename");
|
|
|
|
libchar_found=0;
|
|
(void) strmov(buff,from); /* If to == from */
|
|
from_pos= buff;
|
|
if ((pos=strrchr(from_pos,FN_DEVCHAR))) /* Skip device part */
|
|
{
|
|
pos++;
|
|
to_pos=strnmov(to,from_pos,(size_t) (pos-from_pos));
|
|
from_pos=pos;
|
|
}
|
|
else
|
|
to_pos=to;
|
|
|
|
if (from_pos[0] == FN_CURLIB && from_pos[1] == FN_LIBCHAR)
|
|
from_pos+=2; /* Skip './' */
|
|
if (strchr(from_pos,FN_LIBCHAR))
|
|
{
|
|
*(to_pos++) = FN_C_BEFORE_DIR;
|
|
if (strinstr(from_pos,FN_ROOTDIR) == 1)
|
|
{
|
|
from_pos+=strlen(FN_ROOTDIR); /* Actually +1 but... */
|
|
if (! strchr(from_pos,FN_LIBCHAR))
|
|
{ /* No dir, use [000000] */
|
|
to_pos=strmov(to_pos,FN_C_ROOT_DIR);
|
|
libchar_found++;
|
|
}
|
|
}
|
|
else
|
|
*(to_pos++)=FN_C_DIR_SEP; /* '.' gives current dir */
|
|
|
|
while ((pos=strchr(from_pos,FN_LIBCHAR)))
|
|
{
|
|
if (libchar_found++)
|
|
*(to_pos++)=FN_C_DIR_SEP; /* Add '.' between dirs */
|
|
if (strinstr(from_pos,FN_PARENTDIR) == 1 &&
|
|
from_pos+strlen(FN_PARENTDIR) == pos)
|
|
to_pos=strmov(to_pos,FN_C_PARENT_DIR); /* Found '../' */
|
|
else
|
|
to_pos=strnmov(to_pos,from_pos,(size_t) (pos-from_pos));
|
|
from_pos=pos+1;
|
|
}
|
|
*(to_pos++)=FN_C_AFTER_DIR;
|
|
}
|
|
length= (size_t) (strmov(to_pos,from_pos)-to);
|
|
DBUG_PRINT("exit",("name: '%s'",to));
|
|
DBUG_RETURN(length);
|
|
#endif
|
|
} /* system_filename */
|
|
|
|
|
|
/* Fix a filename to intern (UNIX format) */
|
|
|
|
char *intern_filename(char *to, const char *from)
|
|
{
|
|
size_t length, to_length;
|
|
char buff[FN_REFLEN];
|
|
if (from == to)
|
|
{ /* Dirname may destroy from */
|
|
strmov(buff,from);
|
|
from=buff;
|
|
}
|
|
length= dirname_part(to, from, &to_length); /* Copy dirname & fix chars */
|
|
(void) strmov(to + to_length,from+length);
|
|
return (to);
|
|
} /* intern_filename */
|