Mercurial > hg > xemacs-beta
annotate src/realpath.c @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -0600 |
| parents | 3c3c1d139863 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* |
| 2 * realpath.c -- canonicalize pathname by removing symlinks | |
| 3 * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com> | |
| 2526 | 4 * Copyright (C) 2001, 2002, 2004 Ben Wing. |
| 428 | 5 * |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* Synched up with: Not in FSF. */ | |
| 25 | |
| 771 | 26 /* This file has been Mule-ized, June 2001 by Ben Wing. |
| 27 | |
| 28 Everything in this file now works in terms of internal, not external, | |
| 29 data. This is the only way to be safe, and it makes the code cleaner. */ | |
| 30 | |
| 428 | 31 #include <config.h> |
| 446 | 32 #include "lisp.h" |
| 442 | 33 |
| 2526 | 34 #include "profile.h" |
| 35 | |
| 558 | 36 #include "sysfile.h" |
| 1116 | 37 #include "sysdir.h" |
| 428 | 38 |
| 771 | 39 #define MAX_READLINKS 32 |
| 40 | |
| 1116 | 41 #ifdef WIN32_ANY |
| 446 | 42 #include "syswindows.h" |
| 43 #ifndef ELOOP | |
| 44 #define ELOOP 10062 /* = WSAELOOP in winsock.h */ | |
| 45 #endif | |
| 1116 | 46 #endif |
| 47 | |
| 2526 | 48 Lisp_Object QSin_qxe_realpath; |
| 49 | |
| 446 | 50 /* Length of start of absolute filename. */ |
| 51 static int | |
| 1116 | 52 abs_start (const Ibyte *name) |
| 446 | 53 { |
| 1116 | 54 #ifdef WIN32_ANY |
| 446 | 55 if (isalpha (*name) && IS_DEVICE_SEP (name[1]) |
| 56 && IS_DIRECTORY_SEP (name[2])) | |
| 57 return 3; | |
| 58 else if (IS_DIRECTORY_SEP (*name)) | |
| 59 return IS_DIRECTORY_SEP (name[1]) ? 2 : 1; | |
| 60 else | |
| 61 return 0; | |
| 1116 | 62 #else /* not WIN32_ANY */ |
| 63 return IS_DIRECTORY_SEP (*name) ? 1 : 0; | |
| 64 #endif | |
| 446 | 65 } |
| 1116 | 66 |
| 2526 | 67 /* Find real name of a file by resolving symbolic links and/or shortcuts |
| 68 under Windows (.LNK links), if such support is enabled. | |
| 69 | |
| 70 If no link found, and LINKS_ONLY is false, look up the correct case in | |
| 71 the file system of the last component. | |
| 1116 | 72 |
| 73 Under Windows, UNC servers and shares are lower-cased. Directories must | |
| 74 be given without trailing '/'. One day, this could read Win2K's reparse | |
| 2526 | 75 points. |
| 76 | |
| 77 Returns length of characters copied info BUF. | |
| 78 DOES NOT ZERO TERMINATE!!!!! | |
| 79 */ | |
| 1116 | 80 |
|
4721
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
81 #ifdef REALPATH_CORRECTS_CASE /* Darwin */ |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
82 #include <sys/param.h> |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
83 #include <stdlib.h> |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
84 #endif |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
85 |
| 1116 | 86 static int |
| 2526 | 87 readlink_or_correct_case (const Ibyte *name, Ibyte *buf, Bytecount size, |
| 3042 | 88 #ifndef WIN32_ANY |
| 3044 | 89 Boolint UNUSED (links_only) |
| 3042 | 90 #else |
| 3044 | 91 Boolint links_only |
| 3042 | 92 #endif |
| 3044 | 93 ) |
| 1116 | 94 { |
| 95 #ifndef WIN32_ANY | |
|
4721
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
96 #ifdef REALPATH_CORRECTS_CASE |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
97 /* Darwin's realpath corrects file name case, so we want to use that |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
98 here, as well as our own, non-case-correcting, implementation |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
99 further down in this file. |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
100 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
101 It might be reasonable to incorporate case correction in our own |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
102 realpath implementation, which would help things with |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
103 case-insensitive file systems on Linux; one way to do this would |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
104 be to make sure that init_initial_directory and |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
105 get_initial_directory always give the correct case. */ |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
106 int n = qxe_readlink (name, buf, (size_t) size); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
107 Extbyte realpath_buf[PATH_MAX], *tmp; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
108 DECLARE_EISTRING (realpathing); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
109 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
110 if (n >= 0 || errno != EINVAL) |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
111 return n; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
112 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
113 eicpy_rawz (realpathing, name); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
114 eito_external (realpathing, Qfile_name); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
115 tmp = realpath (eiextdata (realpathing), realpath_buf); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
116 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
117 if (!tmp) |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
118 return -1; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
119 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
120 if (0 == memcmp (eiextdata (realpathing), realpath_buf, |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
121 eiextlen (realpathing))) |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
122 { |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
123 /* No case change needed; tell the caller that. */ |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
124 errno = EINVAL; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
125 return -1; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
126 } |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
127 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
128 eireset (realpathing); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
129 eicpy_ext (realpathing, realpath_buf, Qfile_name); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
130 if (eilen (realpathing) > size) |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
131 { |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
132 errno = ERANGE; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
133 return -1; |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
134 } |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
135 |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
136 memcpy (buf, eidata (realpathing), eilen (realpathing)); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
137 return eilen (realpathing); |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
138 #else /* !REALPATH_CORRECTS_CASE */ |
| 2526 | 139 return qxe_readlink (name, buf, (size_t) size); |
|
4721
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
140 #endif /* REALPATH_CORRECTS_CASE */ |
|
19d70297d866
Make readlink_or_correct_case function correctly on Darwin.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3044
diff
changeset
|
141 #else /* defined (WIN32_ANY) */ |
| 1116 | 142 # ifdef CYGWIN |
| 2526 | 143 int n = qxe_readlink (name, buf, (size_t) size); |
| 1116 | 144 if (n >= 0 || errno != EINVAL) |
| 145 return n; | |
| 146 | |
| 147 /* The file may exist, but isn't a symlink. Try to find the | |
| 148 right name. */ | |
|
4834
b3ea9c582280
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
Ben Wing <ben@xemacs.org>
parents:
4721
diff
changeset
|
149 LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (name, name); |
| 2526 | 150 # else |
| 151 if (mswindows_shortcuts_are_symlinks) | |
| 152 { | |
| 153 Ibyte *tmp = mswindows_read_link (name); | |
| 154 | |
| 155 if (tmp != NULL) | |
| 156 { | |
| 157 /* Fucking fixed buffers. */ | |
| 158 Bytecount len = qxestrlen (tmp); | |
| 159 if (len > size) | |
| 160 { | |
| 161 errno = ENAMETOOLONG; | |
| 162 return -1; | |
| 163 } | |
| 164 memcpy (buf, tmp, len); | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
165 xfree (tmp); |
| 2526 | 166 return len; |
| 167 } | |
| 168 } | |
| 1116 | 169 # endif |
| 170 | |
| 2526 | 171 if (links_only) |
| 172 { | |
| 173 errno = EINVAL; | |
| 174 return -1; | |
| 175 } | |
| 176 | |
| 1116 | 177 { |
| 178 int len = 0; | |
| 179 int err = 0; | |
| 180 const Ibyte *lastname; | |
| 181 int count = 0; | |
| 1204 | 182 const Ibyte *nn; |
| 1116 | 183 DECLARE_EISTRING (result); |
| 184 | |
| 185 assert (*name); | |
| 186 | |
| 187 /* Sort of check we have a valid filename. */ | |
| 188 if (qxestrpbrk (name, "*?|<>\"")) | |
| 189 { | |
| 190 errno = ENOENT; | |
| 191 return -1; | |
| 192 } | |
| 2421 | 193 else if (qxestrlen (name) >= PATH_MAX_INTERNAL) |
| 1116 | 194 { |
| 195 errno = ENAMETOOLONG; | |
| 196 return -1; | |
| 197 } | |
| 198 | |
| 199 /* Find start of filename */ | |
| 200 lastname = name + qxestrlen (name); | |
| 201 while (lastname > name && !IS_DIRECTORY_SEP (lastname[-1])) | |
| 202 --lastname; | |
| 203 | |
| 204 /* Count slashes in unc path */ | |
| 205 if (abs_start (name) == 2) | |
| 1204 | 206 for (nn = name; *nn; nn++) |
| 207 if (IS_DIRECTORY_SEP (*nn)) | |
| 1116 | 208 count++; |
| 209 | |
| 210 if (count >= 2 && count < 4) | |
| 211 { | |
| 212 eicpy_rawz (result, lastname); | |
| 213 eilwr (result); | |
| 214 } | |
| 215 else | |
| 216 { | |
| 217 WIN32_FIND_DATAW find_data; | |
| 218 Extbyte *nameext; | |
| 219 HANDLE dir_handle; | |
| 220 | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
221 nameext = ITEXT_TO_TSTR (name); |
| 1116 | 222 dir_handle = qxeFindFirstFile (nameext, &find_data); |
| 223 if (dir_handle == INVALID_HANDLE_VALUE) | |
| 224 { | |
| 225 errno = ENOENT; | |
| 226 return -1; | |
| 227 } | |
| 228 eicpy_ext (result, (Extbyte *) find_data.cFileName, Qmswindows_tstr); | |
| 229 FindClose (dir_handle); | |
| 230 } | |
| 231 | |
| 2526 | 232 if ((len = eilen (result)) <= size) |
| 1116 | 233 { |
| 234 DECLARE_EISTRING (eilastname); | |
| 235 | |
| 236 eicpy_rawz (eilastname, lastname); | |
| 237 if (eicmp_ei (eilastname, result) == 0) | |
| 2526 | 238 /* Signal that the name is already OK. */ |
| 239 err = EINVAL; | |
| 1116 | 240 else |
| 2526 | 241 memcpy (buf, eidata (result), len); |
| 1116 | 242 } |
| 243 else | |
| 244 err = ENAMETOOLONG; | |
| 245 | |
| 246 errno = err; | |
| 247 return err ? -1 : len; | |
| 248 } | |
| 249 #endif /* WIN32_ANY */ | |
| 250 } | |
| 446 | 251 |
| 771 | 252 /* Mule Note: This function works with and returns |
| 2526 | 253 internally-formatted strings. |
| 254 | |
| 255 if LINKS_ONLY is true, don't do case canonicalization under | |
| 256 Windows. */ | |
| 440 | 257 |
| 867 | 258 Ibyte * |
| 2526 | 259 qxe_realpath (const Ibyte *path, Ibyte *resolved_path, Boolint links_only) |
| 428 | 260 { |
| 2421 | 261 Ibyte copy_path[PATH_MAX_INTERNAL]; |
| 867 | 262 Ibyte *new_path = resolved_path; |
| 263 Ibyte *max_path; | |
| 2526 | 264 Ibyte *retval = NULL; |
| 1116 | 265 #if defined (HAVE_READLINK) || defined (WIN32_ANY) |
| 428 | 266 int readlinks = 0; |
| 2421 | 267 Ibyte link_path[PATH_MAX_INTERNAL]; |
| 428 | 268 int n; |
| 1116 | 269 int abslen = abs_start (path); |
| 428 | 270 #endif |
| 271 | |
| 2526 | 272 PROFILE_DECLARE (); |
| 273 | |
| 274 PROFILE_RECORD_ENTERING_SECTION (QSin_qxe_realpath); | |
| 275 | |
| 1760 | 276 restart: |
| 277 | |
| 428 | 278 /* Make a copy of the source path since we may need to modify it. */ |
| 771 | 279 qxestrcpy (copy_path, path); |
| 428 | 280 path = copy_path; |
| 2421 | 281 max_path = copy_path + PATH_MAX_INTERNAL - 2; |
| 446 | 282 |
| 819 | 283 if (0) |
| 284 ; | |
| 1116 | 285 #ifdef WIN32_ANY |
| 446 | 286 /* Check for c:/... or //server/... */ |
| 988 | 287 else if (abslen == 3 || abslen == 2) |
| 428 | 288 { |
| 462 | 289 /* Make sure drive letter is lowercased. */ |
| 1116 | 290 if (abslen == 3) |
| 291 { | |
| 292 *new_path = tolower (*path); | |
| 293 new_path++; | |
| 294 path++; | |
| 295 abslen--; | |
| 296 } | |
| 988 | 297 /* Coerce directory chars. */ |
| 1116 | 298 while (abslen-- > 0) |
| 299 { | |
| 300 if (IS_DIRECTORY_SEP (*path)) | |
| 301 *new_path++ = DIRECTORY_SEP; | |
| 302 else | |
| 303 *new_path++ = *path; | |
| 304 path++; | |
| 305 } | |
| 428 | 306 } |
| 819 | 307 #endif |
| 308 #ifdef WIN32_NATIVE | |
| 446 | 309 /* No drive letter, but a beginning slash? Prepend drive letter. */ |
| 310 else if (abslen == 1) | |
| 428 | 311 { |
| 2421 | 312 get_initial_directory (new_path, PATH_MAX_INTERNAL - 1); |
| 428 | 313 new_path += 3; |
| 314 path++; | |
| 315 } | |
| 446 | 316 /* Just a path name, prepend the current directory */ |
| 1116 | 317 else |
| 428 | 318 { |
| 2421 | 319 get_initial_directory (new_path, PATH_MAX_INTERNAL - 1); |
| 771 | 320 new_path += qxestrlen (new_path); |
| 446 | 321 if (!IS_DIRECTORY_SEP (new_path[-1])) |
| 322 *new_path++ = DIRECTORY_SEP; | |
| 428 | 323 } |
| 324 #else | |
| 771 | 325 /* If it's a relative pathname use get_initial_directory for starters. */ |
| 819 | 326 else if (abslen == 0) |
| 428 | 327 { |
| 2421 | 328 get_initial_directory (new_path, PATH_MAX_INTERNAL - 1); |
| 771 | 329 new_path += qxestrlen (new_path); |
| 446 | 330 if (!IS_DIRECTORY_SEP (new_path[-1])) |
| 331 *new_path++ = DIRECTORY_SEP; | |
| 428 | 332 } |
| 333 else | |
| 334 { | |
| 446 | 335 /* Copy first directory sep. May have two on cygwin. */ |
| 771 | 336 qxestrncpy (new_path, path, abslen); |
| 446 | 337 new_path += abslen; |
| 338 path += abslen; | |
| 428 | 339 } |
| 340 #endif | |
| 341 /* Expand each slash-separated pathname component. */ | |
| 342 while (*path != '\0') | |
| 343 { | |
| 344 /* Ignore stray "/". */ | |
| 446 | 345 if (IS_DIRECTORY_SEP (*path)) |
| 428 | 346 { |
| 347 path++; | |
| 348 continue; | |
| 349 } | |
| 350 | |
| 351 if (*path == '.') | |
| 352 { | |
| 353 /* Ignore ".". */ | |
| 446 | 354 if (path[1] == '\0' || IS_DIRECTORY_SEP (path[1])) |
| 428 | 355 { |
| 356 path++; | |
| 357 continue; | |
| 358 } | |
| 359 | |
| 442 | 360 /* Handle ".." */ |
| 361 if (path[1] == '.' && | |
| 446 | 362 (path[2] == '\0' || IS_DIRECTORY_SEP (path[2]))) |
| 428 | 363 { |
| 442 | 364 path += 2; |
| 428 | 365 |
| 442 | 366 /* Ignore ".." at root. */ |
| 1116 | 367 if (new_path == resolved_path + abs_start (resolved_path)) |
| 442 | 368 continue; |
| 428 | 369 |
| 442 | 370 /* Handle ".." by backing up. */ |
| 446 | 371 --new_path; |
| 372 while (!IS_DIRECTORY_SEP (new_path[-1])) | |
| 373 --new_path; | |
| 442 | 374 continue; |
| 428 | 375 } |
| 376 } | |
| 377 | |
| 378 /* Safely copy the next pathname component. */ | |
| 446 | 379 while (*path != '\0' && !IS_DIRECTORY_SEP (*path)) |
| 428 | 380 { |
| 381 if (path > max_path) | |
| 382 { | |
| 383 errno = ENAMETOOLONG; | |
| 2526 | 384 goto done; |
| 428 | 385 } |
| 386 *new_path++ = *path++; | |
| 387 } | |
| 388 | |
| 1116 | 389 #if defined (HAVE_READLINK) || defined (WIN32_ANY) |
| 771 | 390 /* See if latest pathname component is a symlink or needs case |
| 391 correction. */ | |
| 428 | 392 *new_path = '\0'; |
| 2526 | 393 n = readlink_or_correct_case (resolved_path, link_path, |
| 394 PATH_MAX_INTERNAL - 1, links_only); | |
| 428 | 395 |
| 396 if (n < 0) | |
| 397 { | |
| 771 | 398 /* EINVAL means the file exists but isn't a symlink or doesn't |
| 399 need case correction. */ | |
| 1116 | 400 #ifdef WIN32_ANY |
| 462 | 401 if (errno != EINVAL && errno != ENOENT) |
| 402 #else | |
| 403 if (errno != EINVAL) | |
| 404 #endif | |
| 2526 | 405 goto done; |
| 428 | 406 } |
| 407 else | |
| 408 { | |
| 409 /* Protect against infinite loops. */ | |
| 410 if (readlinks++ > MAX_READLINKS) | |
| 411 { | |
| 412 errno = ELOOP; | |
| 2526 | 413 goto done; |
| 428 | 414 } |
| 415 | |
| 416 /* Note: readlink doesn't add the null byte. */ | |
| 417 link_path[n] = '\0'; | |
| 446 | 418 |
| 1760 | 419 abslen = abs_start (link_path); |
| 420 if (abslen > 0) | |
| 421 { | |
| 422 /* Start over for an absolute symlink. */ | |
| 423 new_path = resolved_path; | |
| 424 qxestrcat (link_path, path); | |
| 425 path = link_path; | |
| 426 goto restart; | |
| 427 } | |
| 428 | |
| 429 /* Otherwise back up over this component. */ | |
| 430 for (--new_path; !IS_DIRECTORY_SEP (*new_path); --new_path) | |
| 431 assert (new_path > resolved_path); | |
| 428 | 432 |
| 433 /* Safe sex check. */ | |
| 2421 | 434 if (qxestrlen (path) + n >= PATH_MAX_INTERNAL) |
| 428 | 435 { |
| 436 errno = ENAMETOOLONG; | |
| 2526 | 437 goto done; |
| 428 | 438 } |
| 439 | |
| 440 /* Insert symlink contents into path. */ | |
| 771 | 441 qxestrcat (link_path, path); |
| 442 qxestrcpy (copy_path, link_path); | |
| 428 | 443 path = copy_path; |
| 444 } | |
| 1116 | 445 #endif /* HAVE_READLINK || WIN32_ANY */ |
| 446 | 446 *new_path++ = DIRECTORY_SEP; |
| 428 | 447 } |
| 448 | |
| 449 /* Delete trailing slash but don't whomp a lone slash. */ | |
| 1116 | 450 if (new_path != resolved_path + abs_start (resolved_path) && |
| 771 | 451 IS_DIRECTORY_SEP (new_path[-1])) |
| 428 | 452 new_path--; |
| 453 | |
| 454 /* Make sure it's null terminated. */ | |
| 455 *new_path = '\0'; | |
| 446 | 456 |
| 2526 | 457 retval = resolved_path; |
| 458 done: | |
| 459 PROFILE_RECORD_EXITING_SECTION (QSin_qxe_realpath); | |
| 460 return retval; | |
| 428 | 461 } |
| 2526 | 462 |
| 463 void | |
| 464 vars_of_realpath (void) | |
| 465 { | |
| 466 QSin_qxe_realpath = | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4834
diff
changeset
|
467 build_defer_string ("(in qxe_realpath)"); |
| 2526 | 468 staticpro (&QSin_qxe_realpath); |
| 469 } |