Mercurial > hg > xemacs-beta

comparison src/syswindows.h @ 4981:4aebb0131297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bd169a24a554
children 4cfb6aeb989d
comparison
equal deleted inserted replaced
4972:c448f4c38d65 4981:4aebb0131297
842 : strrchr (s, ch)) 842 : strrchr (s, ch))
843 #define qxetcsdup(s) \ 843 #define qxetcsdup(s) \
844 (XEUNICODE_P ? (char *) wcsdup ((wchar_t *) s) \ 844 (XEUNICODE_P ? (char *) wcsdup ((wchar_t *) s) \
845 : xstrdup (s)) 845 : xstrdup (s))
846 846
847 #define C_STRING_TO_TSTR(in, out) \ 847 #define ITEXT_TO_TSTR(in) ITEXT_TO_EXTERNAL (in, Qmswindows_tstr)
848 C_STRING_TO_EXTERNAL (in, out, Qmswindows_tstr) 848 #define LISP_STRING_TO_TSTR(in) LISP_STRING_TO_EXTERNAL (in, Qmswindows_tstr)
849 #define LISP_STRING_TO_TSTR(in, out) \ 849 #define TSTR_TO_ITEXT(in) EXTERNAL_TO_ITEXT (in, Qmswindows_tstr)
850 LISP_STRING_TO_EXTERNAL (in, out, Qmswindows_tstr) 850 #define TSTR_TO_ITEXT_MALLOC(in) \
851 #define TSTR_TO_C_STRING(in, out) \ 851 EXTERNAL_TO_ITEXT_MALLOC (in, Qmswindows_tstr)
852 EXTERNAL_TO_C_STRING (in, out, Qmswindows_tstr)
853 #define TSTR_TO_C_STRING_MALLOC(in, out) \
854 EXTERNAL_TO_C_STRING_MALLOC (in, out, Qmswindows_tstr)
855 852
856 #define build_tstr_string(in) \ 853 #define build_tstr_string(in) \
857 make_extstring (in, qxetcsbytelen ((Extbyte *) in), Qmswindows_tstr) 854 make_extstring (in, qxetcsbytelen ((Extbyte *) in), Qmswindows_tstr)
858 855
859 #define MAX_ANSI_CHAR_LEN 1 856 #define MAX_ANSI_CHAR_LEN 1
950 947
951 #ifdef HAVE_CYGWIN_CONV_PATH 948 #ifdef HAVE_CYGWIN_CONV_PATH
952 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ 949 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \
953 do { \ 950 do { \
954 const Ibyte *lfftt = (path); \ 951 const Ibyte *lfftt = (path); \
952 const Extbyte **lffttout = (const Extbyte **) &(out); \
955 if (isalpha (lfftt[0]) && (IS_DEVICE_SEP (lfftt[1]))) \ 953 if (isalpha (lfftt[0]) && (IS_DEVICE_SEP (lfftt[1]))) \
956 PATHNAME_CONVERT_OUT_TSTR (lfftt, out); \ 954 PATHNAME_CONVERT_OUT_TSTR (lfftt, *lffttout); \
957 else \ 955 else \
958 { \ 956 { \
959 int lfftt_size; \ 957 int lfftt_size; \
960 Extbyte *lfftt_utf8_path; \ 958 Extbyte *lfftt_utf8_path; \
961 Extbyte *lfftt_tstr_path; \ 959 Extbyte *lfftt_tstr_path; \
964 lfftt_size = cygwin_conv_path (CCP_POSIX_TO_WIN_T | CCP_RELATIVE, \ 962 lfftt_size = cygwin_conv_path (CCP_POSIX_TO_WIN_T | CCP_RELATIVE, \
965 lfftt_utf8_path, NULL, 0); \ 963 lfftt_utf8_path, NULL, 0); \
966 lfftt_tstr_path = alloca_extbytes (lfftt_size); \ 964 lfftt_tstr_path = alloca_extbytes (lfftt_size); \
967 cygwin_conv_path (CCP_POSIX_TO_WIN_T | CCP_RELATIVE, \ 965 cygwin_conv_path (CCP_POSIX_TO_WIN_T | CCP_RELATIVE, \
968 lfftt_utf8_path, lfftt_tstr_path, lfftt_size); \ 966 lfftt_utf8_path, lfftt_tstr_path, lfftt_size); \
969 * (const Extbyte **) &(out) = lfftt_tstr_path; \ 967 *lffttout = lfftt_tstr_path; \
970 } \ 968 } \
971 } while (0) 969 } while (0)
972 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \ 970 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \
973 do { \ 971 do { \
974 const Extbyte *ttlff = (path); \ 972 const Extbyte *ttlff = (path); \
978 ttlff_size = cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \ 976 ttlff_size = cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \
979 ttlff, NULL, 0); \ 977 ttlff, NULL, 0); \
980 ttlff_utf8_path = alloca_extbytes (ttlff_size); \ 978 ttlff_utf8_path = alloca_extbytes (ttlff_size); \
981 cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \ 979 cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \
982 ttlff, ttlff_utf8_path, ttlff_size); \ 980 ttlff, ttlff_utf8_path, ttlff_size); \
983 EXTERNAL_TO_C_STRING (ttlff_utf8_path, out, Qutf_8); \ 981 (out) = EXTERNAL_TO_ITEXT (ttlff_utf8_path, Qutf_8); \
984 } while (0) 982 } while (0)
985 #else /* not HAVE_CYGWIN_CONV_PATH */ 983 #else /* not HAVE_CYGWIN_CONV_PATH */
986 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ 984 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \
987 do { \ 985 do { \
988 const Ibyte *lfftt; \ 986 const Ibyte *lfftt; \
992 } while (0) 990 } while (0)
993 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \ 991 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \
994 do { \ 992 do { \
995 const Ibyte *ttlff; \ 993 const Ibyte *ttlff; \
996 \ 994 \
997 TSTR_TO_C_STRING (path, ttlff); \ 995 ttlff = TSTR_TO_ITEXT (path); \
998 INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out); \ 996 INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out); \
999 } while (0) 997 } while (0)
1000 #endif /* (not) HAVE_CYGWIN_CONV_PATH */ 998 #endif /* (not) HAVE_CYGWIN_CONV_PATH */
1001 999
1002 #define LISP_LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ 1000 #define LISP_LOCAL_FILE_FORMAT_TO_TSTR(path, out) \
1021 do \ 1019 do \
1022 { \ 1020 { \
1023 const Extbyte *lfftiwp; \ 1021 const Extbyte *lfftiwp; \
1024 \ 1022 \
1025 LOCAL_FILE_FORMAT_TO_TSTR (path, lfftiwp); \ 1023 LOCAL_FILE_FORMAT_TO_TSTR (path, lfftiwp); \
1026 TSTR_TO_C_STRING (lfftiwp, pathout); \ 1024 (pathout) = TSTR_TO_ITEXT (lfftiwp); \
1027 } \ 1025 } \
1028 while (0) 1026 while (0)
1029 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout) \ 1027 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout) \
1030 do { \ 1028 do { \
1031 const Extbyte *iwtlffp; \ 1029 const Extbyte *iwtlffp; \
1032 C_STRING_TO_TSTR (path, iwtlffp); \ 1030 iwtlffp = ITEXT_TO_TSTR (path); \
1033 TSTR_TO_LOCAL_FILE_FORMAT (iwtlffp, pathout); \ 1031 TSTR_TO_LOCAL_FILE_FORMAT (iwtlffp, pathout); \
1034 } while (0) 1032 } while (0)
1035 #elif defined (CYGWIN) 1033 #elif defined (CYGWIN)
1036 #define LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN(path, pathout) \ 1034 #define LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN(path, pathout) \
1037 do { \ 1035 do { \
1039 internal-format data to a function that (nominally) should work \ 1037 internal-format data to a function that (nominally) should work \
1040 with external-format data. But in point of fact, the Cygwin \ 1038 with external-format data. But in point of fact, the Cygwin \
1041 conversion functions are *NOT* localized, and will fail if they \ 1039 conversion functions are *NOT* localized, and will fail if they \
1042 get 7-bit ISO2022-encoded data. We know that our internal format \ 1040 get 7-bit ISO2022-encoded data. We know that our internal format \
1043 is ASCII-compatible, and so these functions will work fine with \ 1041 is ASCII-compatible, and so these functions will work fine with \
1044 this data. */ \ 1042 this data (maybe ... not when Cygwin uses UTF-8) */ \
1045 const Ibyte *lfftiwp = (path); \ 1043 const Ibyte *lfftiwp = (path); \
1046 if (isalpha (lfftiwp[0]) && (IS_DEVICE_SEP (lfftiwp[1]))) \ 1044 if (isalpha (lfftiwp[0]) && (IS_DEVICE_SEP (lfftiwp[1]))) \
1047 pathout = lfftiwp; \ 1045 (pathout) = lfftiwp; \
1048 else \ 1046 else \
1049 { \ 1047 { \
1050 int lfftiw2 = \ 1048 int lfftiw2 = \
1051 cygwin_posix_to_win32_path_list_buf_size ((char *) lfftiwp); \ 1049 cygwin_posix_to_win32_path_list_buf_size ((char *) lfftiwp); \
1052 pathout = alloca_ibytes (lfftiw2); \ 1050 (pathout) = alloca_ibytes (lfftiw2); \
1053 cygwin_posix_to_win32_path_list ((char *) lfftiwp, (char *) pathout); \ 1051 cygwin_posix_to_win32_path_list ((char *) lfftiwp, (char *) pathout); \
1054 } \ 1052 } \
1055 } while (0) 1053 } while (0)
1056 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout) \ 1054 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout) \
1057 do { \ 1055 do { \
1104 lffmutt_path2 = alloca_ibytes (7 + qxestrlen (lffmutt_path1) \ 1102 lffmutt_path2 = alloca_ibytes (7 + qxestrlen (lffmutt_path1) \
1105 + 1); \ 1103 + 1); \
1106 qxestrncpy (lffmutt_path2, lffmutt_pathint, 7); \ 1104 qxestrncpy (lffmutt_path2, lffmutt_pathint, 7); \
1107 qxestrcpy (lffmutt_path2 + 7, lffmutt_path1); \ 1105 qxestrcpy (lffmutt_path2 + 7, lffmutt_path1); \
1108 } \ 1106 } \
1109 C_STRING_TO_TSTR (lffmutt_path2, pathout); \ 1107 (pathout) = ITEXT_TO_TSTR (lffmutt_path2); \
1110 } \ 1108 } \
1111 else \ 1109 else \
1112 /* A straight URL, just convert */ \ 1110 /* A straight URL, just convert */ \
1113 LISP_STRING_TO_TSTR (lispstr, pathout); \ 1111 (pathout) = LISP_STRING_TO_TSTR (lispstr); \
1114 } \ 1112 } \
1115 else \ 1113 else \
1116 /* Not URL-style, must be a straight filename. */ \ 1114 /* Not URL-style, must be a straight filename. */ \
1117 LISP_LOCAL_FILE_FORMAT_TO_TSTR (lispstr, pathout); \ 1115 LISP_LOCAL_FILE_FORMAT_TO_TSTR (lispstr, pathout); \
1118 } while (0) 1116 } while (0)