Mercurial > hg > xemacs-beta
annotate src/realpath.c @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | 19a72041c5ed |
| children | 3c3c1d139863 |
| 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); | |
| 165 xfree (tmp, Ibyte *); | |
| 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 } |