comparison src/syswindows.h @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 543769b89fed
children ab71ad6ff3dd
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* Copyright (C) 2000 Free Software Foundation, Inc. 1 /* Copyright (C) 2000 Free Software Foundation, Inc.
2 Copyright (C) 2000, 2001, 2002 Ben Wing. 2 Copyright (C) 2000, 2001, 2002, 2004 Ben Wing.
3 3
4 This file is part of XEmacs. 4 This file is part of XEmacs.
5 5
6 XEmacs is free software; you can redistribute it and/or modify it 6 XEmacs is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License as published by the 7 under the terms of the GNU General Public License as published by the
37 */ 37 */
38 38
39 #ifndef INCLUDED_syswindows_h_ 39 #ifndef INCLUDED_syswindows_h_
40 #define INCLUDED_syswindows_h_ 40 #define INCLUDED_syswindows_h_
41 41
42 /* There are two different general Windows-related include files in src. 42 /* See win32.c for info about the different Windows files in XEmacs. */
43
44 Uses are approximately:
45
46 syswindows.h: Wrapper around <windows.h>, including missing defines as
47 necessary. Includes stuff needed on both Cygwin and native Windows,
48 regardless of window system chosen. Includes definitions needed for
49 Unicode conversion/encapsulation, and other Mule-related stuff, plus
50 various other prototypes and Windows-specific, but not GUI-specific,
51 stuff.
52
53 console-msw.h: Used on both Cygwin and native Windows, but only when
54 native window system (as opposed to X) chosen. Includes syswindows.h.
55 */
56
57 /* See s/windowsnt.h for a description of what exactly the various
58 constants such as WIN32_NATIVE, HAVE_MS_WINDOWS, CYGWIN, and MINGW
59 mean, and how they relate to each other. */
60 43
61 /* ------------------------- Basic includes ------------------------- */ 44 /* ------------------------- Basic includes ------------------------- */
62 45
63 #ifndef WIN32_LEAN_AND_MEAN 46 #ifndef WIN32_LEAN_AND_MEAN
64 #define WIN32_LEAN_AND_MEAN 47 #define WIN32_LEAN_AND_MEAN
517 500
518 #endif /* CYGWIN */ 501 #endif /* CYGWIN */
519 502
520 /* ------------------------- Unicode encapsulation ------------------------- */ 503 /* ------------------------- Unicode encapsulation ------------------------- */
521 504
522 /* See intl-encap-win32.c for more information about Unicode-encapsulation */ 505 /* See intl-win32.c for more information about Unicode-encapsulation */
523 506
524 #define ERROR_WHEN_NONINTERCEPTED_FUNS_USED 507 #define ERROR_WHEN_NONINTERCEPTED_FUNS_USED
525 508
526 #include "intl-auto-encap-win32.h" 509 #include "intl-auto-encap-win32.h"
527 510
760 /* ------------------------- Unicode conversion ------------------------- */ 743 /* ------------------------- Unicode conversion ------------------------- */
761 744
762 /* Set early in command-line processing, when -nuni or 745 /* Set early in command-line processing, when -nuni or
763 --no-unicode-lib-calls is seen. */ 746 --no-unicode-lib-calls is seen. */
764 extern int no_mswin_unicode_lib_calls; 747 extern int no_mswin_unicode_lib_calls;
765 /* Set early, in init_win32_very_early(). */ 748 /* Set early, in init_win32_very_very_early(). */
766 extern int mswindows_windows9x_p; 749 extern int mswindows_windows9x_p;
767 #define XEUNICODE_P (!mswindows_windows9x_p && !no_mswin_unicode_lib_calls) 750 #define XEUNICODE_P (!mswindows_windows9x_p && !no_mswin_unicode_lib_calls)
768 751
769 #define XELPTSTR LPWSTR 752 #define XELPTSTR LPWSTR
770 #define XELPCTSTR LPCWSTR 753 #define XELPCTSTR LPCWSTR
830 } 813 }
831 814
832 Extbyte *convert_multibyte_to_unicode_malloc (const Extbyte *src, 815 Extbyte *convert_multibyte_to_unicode_malloc (const Extbyte *src,
833 Bytecount n, 816 Bytecount n,
834 int cp, Bytecount *size_out); 817 int cp, Bytecount *size_out);
818 Extbyte *convert_unicode_to_multibyte_malloc (const Extbyte *src,
819 Bytecount n,
820 int cp, Bytecount *size_out);
835 Ibyte *convert_multibyte_to_internal_malloc (const Extbyte *src, 821 Ibyte *convert_multibyte_to_internal_malloc (const Extbyte *src,
836 Bytecount n, 822 Bytecount n,
837 int cp, Bytecount *size_out); 823 int cp, Bytecount *size_out);
838 void convert_multibyte_to_unicode_dynarr (const Extbyte *src, Bytecount n, 824 void convert_multibyte_to_unicode_dynarr (const Extbyte *src, Bytecount n,
839 int cp, unsigned_char_dynarr *dst); 825 int cp, unsigned_char_dynarr *dst);
826 void convert_unicode_to_multibyte_dynarr (const Extbyte *src, Bytecount n,
827 int cp, unsigned_char_dynarr *dst);
828
829 Bytecount unicode_multibyte_convert_size (const char *srctext, const void *src,
830 Bytecount src_size, int to_unicode,
831 int cp);
832 void *unicode_multibyte_convert_copy_data (const char *srctext,
833 void *alloca_data);
834
835 /* NOTE: If you make two invocations of the following functions in the same
836 subexpression and use the exact same expression for the source in both
837 cases, you will lose. In this unlikely case, you may get an abort, and
838 need to rewrite the code.
839
840 We need to use ALLOCA_FUNCALL_OK here, see NEW_DFC in text.h.
841 */
842
843 #ifdef WEXTTEXT_IS_WIDE
844 #define MULTIBYTE_TO_WEXTTEXT(str) \
845 ((Wexttext *) \
846 unicode_multibyte_convert_copy_data \
847 (#str, ALLOCA_FUNCALL_OK (unicode_multibyte_convert_size \
848 (#str, str, strlen (str) + 1, 1, CP_ACP))))
849
850 #define WEXTTEXT_TO_MULTIBYTE(str) \
851 ((Extbyte *) \
852 unicode_multibyte_convert_copy_data \
853 (#str, ALLOCA_FUNCALL_OK (unicode_multibyte_convert_size \
854 (#str, str, \
855 (wcslen (str) + 1) * sizeof (WCHAR), 0, \
856 CP_ACP))))
857 #else
858 #define MULTIBYTE_TO_WEXTTEXT(str) ((Wexttext *) (str))
859 #define WEXTTEXT_TO_MULTIBYTE(str) ((Extbyte *) (str))
860 #endif
861
862 /* #### mbstowcs() uses MB_ERR_INVALID_CHARS in addition to MB_PRECOMPOSED.
863 Should we do this? But then we have to handle errors.
864 #### Do we already check for invalid sequences in the coding system? */
865 #define MBTOWC_OPTIONS MB_PRECOMPOSED /* | MB_ERR_INVALID_CHARS */
866 /* The following options are what wcstombs() uses in the CRT. It uses
867 NULL in place of "~". */
868 #define WCTOMB_OPTIONS WC_COMPOSITECHECK | WC_SEPCHARS
869 #define WCTOMB_INVALID_STRING "~"
840 870
841 /* ------------------------- Other Mule stuff ------------------------- */ 871 /* ------------------------- Other Mule stuff ------------------------- */
842 872
843 LCID mswindows_current_locale (void); 873 LCID mswindows_current_locale (void);
844 int mswindows_locale_to_code_page (LCID lcid); 874 int mswindows_locale_to_code_page (LCID lcid);
893 pathout = ltwffp; \ 923 pathout = ltwffp; \
894 else \ 924 else \
895 { \ 925 { \
896 int ltwff2 = \ 926 int ltwff2 = \
897 cygwin_posix_to_win32_path_list_buf_size ((char *) ltwffp); \ 927 cygwin_posix_to_win32_path_list_buf_size ((char *) ltwffp); \
898 pathout = (Ibyte *) ALLOCA (ltwff2); \ 928 pathout = alloca_ibytes (ltwff2); \
899 cygwin_posix_to_win32_path_list ((char *) ltwffp, (char *) pathout); \ 929 cygwin_posix_to_win32_path_list ((char *) ltwffp, (char *) pathout); \
900 } \ 930 } \
901 } while (0) 931 } while (0)
902 #else 932 #else
903 #define LOCAL_TO_WIN32_FILE_FORMAT(path, pathout) \ 933 #define LOCAL_TO_WIN32_FILE_FORMAT(path, pathout) \
910 #define WIN32_TO_LOCAL_FILE_FORMAT(path, pathout) \ 940 #define WIN32_TO_LOCAL_FILE_FORMAT(path, pathout) \
911 do { \ 941 do { \
912 Ibyte *wtlff1 = (path); \ 942 Ibyte *wtlff1 = (path); \
913 int wtlff2 = \ 943 int wtlff2 = \
914 cygwin_win32_to_posix_path_list_buf_size ((char *) wtlff1); \ 944 cygwin_win32_to_posix_path_list_buf_size ((char *) wtlff1); \
915 Ibyte *wtlff3 = (Ibyte *) ALLOCA (wtlff2); \ 945 Ibyte *wtlff3 = alloca_ibytes (wtlff2); \
916 cygwin_win32_to_posix_path_list ((char *) wtlff1, (char *) wtlff3); \ 946 cygwin_win32_to_posix_path_list ((char *) wtlff1, (char *) wtlff3); \
917 (pathout) = wtlff3; \ 947 (pathout) = wtlff3; \
918 } while (0) 948 } while (0)
919 #else 949 #else
920 #define WIN32_TO_LOCAL_FILE_FORMAT(path, pathout) \ 950 #define WIN32_TO_LOCAL_FILE_FORMAT(path, pathout) \
938 && *++lffmutt_fname1 == '/' && *++lffmutt_fname1 == '/') \ 968 && *++lffmutt_fname1 == '/' && *++lffmutt_fname1 == '/') \
939 { \ 969 { \
940 /* If URL style file, the innards may have Cygwin mount points and \ 970 /* If URL style file, the innards may have Cygwin mount points and \
941 the like. so separate out the innards, process them, and put back \ 971 the like. so separate out the innards, process them, and put back \
942 together. */ \ 972 together. */ \
943 if (qxestrncasecmp_c (lffmutt_pathint, "file://", 7) == 0) \ 973 if (qxestrncasecmp_ascii (lffmutt_pathint, "file://", 7) == 0) \
944 { \ 974 { \
945 Ibyte *lffmutt_path1, *lffmutt_path2; \ 975 Ibyte *lffmutt_path1, *lffmutt_path2; \
946 LOCAL_TO_WIN32_FILE_FORMAT (lffmutt_pathint + 7, lffmutt_path1); \ 976 LOCAL_TO_WIN32_FILE_FORMAT (lffmutt_pathint + 7, lffmutt_path1); \
947 if (lffmutt_path1 == lffmutt_pathint + 7) /* Optimization */ \ 977 if (lffmutt_path1 == lffmutt_pathint + 7) /* Optimization */ \
948 lffmutt_path2 = lffmutt_pathint; \ 978 lffmutt_path2 = lffmutt_pathint; \