comparison src/sysdep.c @ 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 91a83e231f92
children ab71ad6ff3dd
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* Interfaces to system-dependent kernel and library entries. 1 /* Interfaces to system-dependent kernel and library entries.
2 Copyright (C) 1985-1988, 1992-1995 Free Software Foundation, Inc. 2 Copyright (C) 1985-1988, 1992-1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Tinker Systems. 3 Copyright (C) 1995 Tinker Systems.
4 Copyright (C) 2000, 2001, 2002, 2003 Ben Wing. 4 Copyright (C) 2000, 2001, 2002, 2003, 2004 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
614 results, so put the slash back. */ 614 results, so put the slash back. */
615 dir = Ffile_name_as_directory (dir); 615 dir = Ffile_name_as_directory (dir);
616 dir = Funhandled_file_name_directory (dir); 616 dir = Funhandled_file_name_directory (dir);
617 dir = expand_and_dir_to_file (dir, Qnil); 617 dir = expand_and_dir_to_file (dir, Qnil);
618 618
619 str = (Ibyte *) ALLOCA (XSTRING_LENGTH (dir) + 2); 619 str = alloca_ibytes (XSTRING_LENGTH (dir) + 2);
620 len = XSTRING_LENGTH (dir); 620 len = XSTRING_LENGTH (dir);
621 memcpy (str, XSTRING_DATA (dir), len); 621 memcpy (str, XSTRING_DATA (dir), len);
622 if (!IS_ANY_SEP (str[len - 1])) 622 if (!IS_ANY_SEP (str[len - 1]))
623 str[len++] = DIRECTORY_SEP; 623 str[len++] = DIRECTORY_SEP;
624 str[len] = 0; 624 str[len] = 0;
2297 struct utsname uts; 2297 struct utsname uts;
2298 uname (&uts); 2298 uname (&uts);
2299 Vsystem_name = build_string (uts.nodename); 2299 Vsystem_name = build_string (uts.nodename);
2300 #else /* HAVE_GETHOSTNAME */ 2300 #else /* HAVE_GETHOSTNAME */
2301 int hostname_size = 256; 2301 int hostname_size = 256;
2302 /* !!#### Needs review */
2302 char *hostname = (char *) ALLOCA (hostname_size); 2303 char *hostname = (char *) ALLOCA (hostname_size);
2303 2304
2304 /* Try to get the host name; if the buffer is too short, try 2305 /* Try to get the host name; if the buffer is too short, try
2305 again. Apparently, the only indication gethostname gives of 2306 again. Apparently, the only indication gethostname gives of
2306 whether the buffer was large enough is the presence or absence 2307 whether the buffer was large enough is the presence or absence
2313 /* Was the buffer large enough for the '\0'? */ 2314 /* Was the buffer large enough for the '\0'? */
2314 if ((int) strlen (hostname) < (hostname_size - 1)) 2315 if ((int) strlen (hostname) < (hostname_size - 1))
2315 break; 2316 break;
2316 2317
2317 hostname_size <<= 1; 2318 hostname_size <<= 1;
2319 /* !!#### Needs review */
2318 hostname = (char *) ALLOCA (hostname_size); 2320 hostname = (char *) ALLOCA (hostname_size);
2319 } 2321 }
2320 # if defined( HAVE_SOCKETS) 2322 # if defined( HAVE_SOCKETS)
2321 /* Turn the hostname into the official, fully-qualified hostname. 2323 /* Turn the hostname into the official, fully-qualified hostname.
2322 Don't do this if we're going to dump; this can confuse system 2324 Don't do this if we're going to dump; this can confuse system
2354 while (*alias && !strchr (*alias, '.')) 2356 while (*alias && !strchr (*alias, '.'))
2355 alias++; 2357 alias++;
2356 if (*alias) 2358 if (*alias)
2357 fqdn = *alias; 2359 fqdn = *alias;
2358 } 2360 }
2361 /* !!#### Needs review */
2359 hostname = (char *) ALLOCA (strlen (fqdn) + 1); 2362 hostname = (char *) ALLOCA (strlen (fqdn) + 1);
2360 strcpy (hostname, fqdn); 2363 strcpy (hostname, fqdn);
2361 } 2364 }
2362 # else /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */ 2365 # else /* !(HAVE_GETADDRINFO && HAVE_GETNAMEINFO) */
2363 struct addrinfo hints, *res; 2366 struct addrinfo hints, *res;
2371 #endif 2374 #endif
2372 hints.ai_socktype = SOCK_STREAM; 2375 hints.ai_socktype = SOCK_STREAM;
2373 hints.ai_protocol = 0; 2376 hints.ai_protocol = 0;
2374 if (!getaddrinfo (hostname, NULL, &hints, &res)) 2377 if (!getaddrinfo (hostname, NULL, &hints, &res))
2375 { 2378 {
2379 /* !!#### Needs review */
2376 hostname = (char *) ALLOCA (strlen (res->ai_canonname) + 1); 2380 hostname = (char *) ALLOCA (strlen (res->ai_canonname) + 1);
2377 strcpy (hostname, res->ai_canonname); 2381 strcpy (hostname, res->ai_canonname);
2378 2382
2379 freeaddrinfo (res); 2383 freeaddrinfo (res);
2380 } 2384 }
2576 return _open (path, oflag, mode); 2580 return _open (path, oflag, mode);
2577 } 2581 }
2578 2582
2579 #endif /* WIN32_NATIVE */ 2583 #endif /* WIN32_NATIVE */
2580 2584
2581 /* Just one call with normal open() semantics. */ 2585 /* Just call open() with normal open() semantics, with some fixups for
2586 problems under Windows. */
2582 2587
2583 static int 2588 static int
2584 underlying_open (const Extbyte *path, int oflag, int mode) 2589 underlying_open (const Extbyte *path, int oflag, int mode)
2585 { 2590 {
2586 #ifdef WIN32_NATIVE 2591 #ifdef WIN32_NATIVE
2597 #else 2602 #else
2598 return open (path, oflag, mode); 2603 return open (path, oflag, mode);
2599 #endif /* WIN32_NATIVE */ 2604 #endif /* WIN32_NATIVE */
2600 } 2605 }
2601 2606
2602 /* Like qxe_open() below but operates on externally-encoded filenames. */ 2607 static int
2603 2608 retry_open_1 (const Extbyte *path, int oflag, int mode)
2604 int XCDECL 2609 {
2605 retry_open (const Extbyte *path, int oflag, ...)
2606 {
2607 int mode;
2608 va_list ap;
2609
2610 va_start (ap, oflag);
2611 mode = va_arg (ap, int);
2612 va_end (ap);
2613
2614 #ifdef INTERRUPTIBLE_OPEN 2610 #ifdef INTERRUPTIBLE_OPEN
2615 { 2611 {
2616 int rtnval; 2612 int rtnval;
2617 while ((rtnval = underlying_open (path, oflag, mode)) == -1 2613 while ((rtnval = underlying_open (path, oflag, mode)) == -1
2618 && (errno == EINTR)) 2614 && (errno == EINTR))
2621 } 2617 }
2622 #else 2618 #else
2623 return underlying_open (path, oflag, mode); 2619 return underlying_open (path, oflag, mode);
2624 #endif 2620 #endif
2625 } 2621 }
2622
2623 /* A version of open() that retries when interrupted. Operates on
2624 externally-encoded filenames. */
2625
2626 int XCDECL
2627 retry_open (const Extbyte *path, int oflag, ...)
2628 {
2629 int mode;
2630 va_list ap;
2631
2632 va_start (ap, oflag);
2633 mode = va_arg (ap, int);
2634 va_end (ap);
2635
2636 return retry_open_1 (path, oflag, mode);
2637 }
2638
2639 #if defined (WIN32_NATIVE) && defined (WEXTTEXT_IS_WIDE)
2640
2641 /* Like retry_open() but operate on Wexttext filenames. */
2642
2643 int XCDECL
2644 wext_retry_open (const Wexttext *path, int oflag, ...)
2645 {
2646 int mode;
2647 va_list ap;
2648
2649 va_start (ap, oflag);
2650 mode = va_arg (ap, int);
2651 va_end (ap);
2652
2653 if (!XEUNICODE_P)
2654 return retry_open_1 (WEXTTEXT_TO_MULTIBYTE (path), oflag, mode);
2655 else
2656 return retry_open_1 ((Extbyte *) path, oflag, mode);
2657 }
2658
2659 #endif
2626 2660
2627 /* The basic external entry point to open(). Handles conversion to 2661 /* The basic external entry point to open(). Handles conversion to
2628 external encoding, interruptions, etc. */ 2662 external encoding, interruptions, etc. */
2629 2663
2630 int XCDECL 2664 int XCDECL
2782 2816
2783 /* #### Should also encapsulate fflush(). 2817 /* #### Should also encapsulate fflush().
2784 #### Should conceivably encapsulate getchar() etc. What a pain! */ 2818 #### Should conceivably encapsulate getchar() etc. What a pain! */
2785 2819
2786 FILE * 2820 FILE *
2787 retry_fopen (const Extbyte *path, const Char_ASCII *mode) 2821 retry_fopen (const Extbyte *path, const Ascbyte *mode)
2788 { 2822 {
2789 #ifdef WIN32_NATIVE 2823 #ifdef WIN32_NATIVE
2790 int fd; 2824 int fd;
2791 int oflag; 2825 int oflag;
2792 const Char_ASCII *mode_save = mode; 2826 const Ascbyte *mode_save = mode;
2793 2827
2794 /* Force all file handles to be non-inheritable. This is necessary to 2828 /* Force all file handles to be non-inheritable. This is necessary to
2795 ensure child processes don't unwittingly inherit handles that might 2829 ensure child processes don't unwittingly inherit handles that might
2796 prevent future file access. */ 2830 prevent future file access. */
2797 2831
2837 return fopen (path, mode); 2871 return fopen (path, mode);
2838 #endif /* defined (INTERRUPTIBLE_OPEN) */ 2872 #endif /* defined (INTERRUPTIBLE_OPEN) */
2839 } 2873 }
2840 2874
2841 FILE * 2875 FILE *
2842 qxe_fopen (const Ibyte *path, const Char_ASCII *mode) 2876 qxe_fopen (const Ibyte *path, const Ascbyte *mode)
2843 { 2877 {
2844 Extbyte *pathout; 2878 Extbyte *pathout;
2845 PATHNAME_CONVERT_OUT (path, pathout); 2879 PATHNAME_CONVERT_OUT (path, pathout);
2846 return retry_fopen (pathout, mode); 2880 return retry_fopen (pathout, mode);
2847 } 2881 }
3415 /* Emulation of missing functions from wchar.h */ 3449 /* Emulation of missing functions from wchar.h */
3416 /************************************************************************/ 3450 /************************************************************************/
3417 3451
3418 #ifndef HAVE_WCHAR_H 3452 #ifndef HAVE_WCHAR_H
3419 size_t 3453 size_t
3420 wcslen(const wchar_t *s) 3454 wcslen (const wchar_t *s)
3421 { 3455 {
3422 const wchar_t *p = s; 3456 const wchar_t *p = s;
3423 3457
3424 while (*p++) 3458 while (*p++)
3425 ; 3459 ;