Mercurial > hg > xemacs-beta
comparison src/fileio.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 | 04bc9d2f42c7 |
children | ab71ad6ff3dd |
comparison
equal
deleted
inserted
replaced
2366:2a392e0c390a | 2367:ecf1ebac70d8 |
---|---|
1 /* File IO for XEmacs. | 1 /* File IO for XEmacs. |
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) 1996, 2001, 2002, 2003 Ben Wing. | 3 Copyright (C) 1996, 2001, 2002, 2003, 2004 Ben Wing. |
4 | 4 |
5 This file is part of XEmacs. | 5 This file is part of XEmacs. |
6 | 6 |
7 XEmacs is free software; you can redistribute it and/or modify it | 7 XEmacs is free software; you can redistribute it and/or modify it |
8 under the terms of the GNU General Public License as published by the | 8 under the terms of the GNU General Public License as published by the |
265 (filename, operation)) | 265 (filename, operation)) |
266 { | 266 { |
267 /* This function does not GC */ | 267 /* This function does not GC */ |
268 /* This function can be called during GC */ | 268 /* This function can be called during GC */ |
269 /* This function must not munge the match data. */ | 269 /* This function must not munge the match data. */ |
270 Lisp_Object chain, inhibited_handlers; | 270 Lisp_Object inhibited_handlers; |
271 | 271 |
272 CHECK_STRING (filename); | 272 CHECK_STRING (filename); |
273 | 273 |
274 if (EQ (operation, Vinhibit_file_name_operation)) | 274 if (EQ (operation, Vinhibit_file_name_operation)) |
275 inhibited_handlers = Vinhibit_file_name_handlers; | 275 inhibited_handlers = Vinhibit_file_name_handlers; |
276 else | 276 else |
277 inhibited_handlers = Qnil; | 277 inhibited_handlers = Qnil; |
278 | 278 |
279 EXTERNAL_LIST_LOOP (chain, Vfile_name_handler_alist) | 279 { |
280 { | 280 EXTERNAL_LIST_LOOP_2 (elt, Vfile_name_handler_alist) |
281 Lisp_Object elt = XCAR (chain); | 281 { |
282 if (CONSP (elt)) | 282 if (CONSP (elt)) |
283 { | 283 { |
284 Lisp_Object string = XCAR (elt); | 284 Lisp_Object string = XCAR (elt); |
285 if (STRINGP (string) | 285 if (STRINGP (string) |
286 && (fast_lisp_string_match (string, filename) >= 0)) | 286 && (fast_lisp_string_match (string, filename) >= 0)) |
287 { | 287 { |
288 Lisp_Object handler = XCDR (elt); | 288 Lisp_Object handler = XCDR (elt); |
289 if (NILP (Fmemq (handler, inhibited_handlers))) | 289 if (NILP (Fmemq (handler, inhibited_handlers))) |
290 return handler; | 290 return handler; |
291 } | 291 } |
292 } | 292 } |
293 QUIT; | 293 } |
294 } | 294 } |
295 return Qnil; | 295 return Qnil; |
296 } | 296 } |
297 | 297 |
298 static Lisp_Object | 298 static Lisp_Object |
299 call2_check_string (Lisp_Object fn, Lisp_Object arg0, Lisp_Object arg1) | 299 call2_check_string (Lisp_Object fn, Lisp_Object arg0, Lisp_Object arg1) |
371 if (p[-1] == ':') | 371 if (p[-1] == ':') |
372 { | 372 { |
373 Ibyte *res; | 373 Ibyte *res; |
374 Ibyte *wd = mswindows_getdcwd (toupper (*beg) - 'A' + 1); | 374 Ibyte *wd = mswindows_getdcwd (toupper (*beg) - 'A' + 1); |
375 | 375 |
376 res = alloca_array (Ibyte, | 376 res = alloca_ibytes ((wd ? qxestrlen (wd) : 0) + 10); /* go overboard */ |
377 (wd ? qxestrlen (wd) : 0) + 10); /* go overboard */ | |
378 res[0] = '\0'; | 377 res[0] = '\0'; |
379 if (p == beg + 4 && IS_DIRECTORY_SEP (*beg) && beg[1] == ':') | 378 if (p == beg + 4 && IS_DIRECTORY_SEP (*beg) && beg[1] == ':') |
380 { | 379 { |
381 qxestrncpy (res, beg, 2); | 380 qxestrncpy (res, beg, 2); |
382 beg += 2; | 381 beg += 2; |
574 /* If the file name has special constructs in it, | 573 /* If the file name has special constructs in it, |
575 call the corresponding file handler. */ | 574 call the corresponding file handler. */ |
576 handler = Ffind_file_name_handler (directory, Qdirectory_file_name); | 575 handler = Ffind_file_name_handler (directory, Qdirectory_file_name); |
577 if (!NILP (handler)) | 576 if (!NILP (handler)) |
578 return call2_check_string (handler, Qdirectory_file_name, directory); | 577 return call2_check_string (handler, Qdirectory_file_name, directory); |
579 buf = (Ibyte *) ALLOCA (XSTRING_LENGTH (directory) + 20); | 578 buf = alloca_ibytes (XSTRING_LENGTH (directory) + 20); |
580 directory_file_name (XSTRING_DATA (directory), buf); | 579 directory_file_name (XSTRING_DATA (directory), buf); |
581 return build_intstring (buf); | 580 return build_intstring (buf); |
582 } | 581 } |
583 | 582 |
584 /* Fmake_temp_name used to be a simple wrapper around mktemp(), but it | 583 /* Fmake_temp_name used to be a simple wrapper around mktemp(), but it |
976 } | 975 } |
977 else /* ~user/filename */ | 976 else /* ~user/filename */ |
978 { | 977 { |
979 for (p = nm; *p && (!IS_DIRECTORY_SEP (*p)); p++) | 978 for (p = nm; *p && (!IS_DIRECTORY_SEP (*p)); p++) |
980 DO_NOTHING; | 979 DO_NOTHING; |
981 o = (Ibyte *) ALLOCA (p - nm + 1); | 980 o = alloca_ibytes (p - nm + 1); |
982 memcpy (o, nm, p - nm); | 981 memcpy (o, nm, p - nm); |
983 o [p - nm] = 0; | 982 o [p - nm] = 0; |
984 | 983 |
985 /* #### While NT is single-user (for the moment) you still | 984 /* #### While NT is single-user (for the moment) you still |
986 can have multiple user profiles users defined, each with | 985 can have multiple user profiles users defined, each with |
1046 } | 1045 } |
1047 #endif /* WIN32_NATIVE */ | 1046 #endif /* WIN32_NATIVE */ |
1048 if (!newdir) | 1047 if (!newdir) |
1049 { | 1048 { |
1050 /* Either nm starts with /, or drive isn't mounted. */ | 1049 /* Either nm starts with /, or drive isn't mounted. */ |
1051 newdir = (Ibyte *) ALLOCA (4); | 1050 newdir = alloca_ibytes (4); |
1052 newdir[0] = DRIVE_LETTER (drive); | 1051 newdir[0] = DRIVE_LETTER (drive); |
1053 newdir[1] = ':'; | 1052 newdir[1] = ':'; |
1054 newdir[2] = '/'; | 1053 newdir[2] = '/'; |
1055 newdir[3] = 0; | 1054 newdir[3] = 0; |
1056 } | 1055 } |
1110 drive = newdir[0]; | 1109 drive = newdir[0]; |
1111 newdir += 2; | 1110 newdir += 2; |
1112 } | 1111 } |
1113 if (!IS_DIRECTORY_SEP (nm[0])) | 1112 if (!IS_DIRECTORY_SEP (nm[0])) |
1114 { | 1113 { |
1115 Ibyte *tmp = (Ibyte *) ALLOCA (qxestrlen (newdir) + | 1114 Ibyte *tmp = alloca_ibytes (qxestrlen (newdir) + |
1116 qxestrlen (nm) + 2); | 1115 qxestrlen (nm) + 2); |
1117 file_name_as_directory (tmp, newdir); | 1116 file_name_as_directory (tmp, newdir); |
1118 qxestrcat (tmp, nm); | 1117 qxestrcat (tmp, nm); |
1119 nm = tmp; | 1118 nm = tmp; |
1120 } | 1119 } |
1121 if (drive) | 1120 if (drive) |
1150 #endif | 1149 #endif |
1151 && collapse_newdir) | 1150 && collapse_newdir) |
1152 { | 1151 { |
1153 if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) | 1152 if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) |
1154 { | 1153 { |
1155 newdir = | 1154 /* !!#### Use ei API */ |
1156 (Ibyte *) | 1155 newdir = qxestrcpy (alloca_ibytes (qxestrlen (newdir) + 1), |
1157 qxestrcpy ((Ibyte *) ALLOCA (qxestrlen (newdir) + 1), | 1156 newdir); |
1158 newdir); | |
1159 p = newdir + 2; | 1157 p = newdir + 2; |
1160 while (*p && !IS_DIRECTORY_SEP (*p)) p++; | 1158 while (*p && !IS_DIRECTORY_SEP (*p)) p++; |
1161 p++; | 1159 p++; |
1162 while (*p && !IS_DIRECTORY_SEP (*p)) p++; | 1160 while (*p && !IS_DIRECTORY_SEP (*p)) p++; |
1163 *p = 0; | 1161 *p = 0; |
1177 #ifdef WIN32_FILENAMES | 1175 #ifdef WIN32_FILENAMES |
1178 && !(length == 2 && IS_DIRECTORY_SEP (newdir[0])) | 1176 && !(length == 2 && IS_DIRECTORY_SEP (newdir[0])) |
1179 #endif | 1177 #endif |
1180 ) | 1178 ) |
1181 { | 1179 { |
1182 Ibyte *temp = (Ibyte *) ALLOCA (length); | 1180 Ibyte *temp = alloca_ibytes (length); |
1183 memcpy (temp, newdir, length - 1); | 1181 memcpy (temp, newdir, length - 1); |
1184 temp[length - 1] = 0; | 1182 temp[length - 1] = 0; |
1185 newdir = temp; | 1183 newdir = temp; |
1186 } | 1184 } |
1187 tlen = length + 1; | 1185 tlen = length + 1; |
1193 tlen += qxestrlen (nm) + 1; | 1191 tlen += qxestrlen (nm) + 1; |
1194 #ifdef WIN32_FILENAMES | 1192 #ifdef WIN32_FILENAMES |
1195 /* Reserve space for drive specifier and escape prefix, since either | 1193 /* Reserve space for drive specifier and escape prefix, since either |
1196 or both may need to be inserted. (The Microsoft x86 compiler | 1194 or both may need to be inserted. (The Microsoft x86 compiler |
1197 produces incorrect code if the following two lines are combined.) */ | 1195 produces incorrect code if the following two lines are combined.) */ |
1198 target = (Ibyte *) ALLOCA (tlen + 4); | 1196 target = alloca_ibytes (tlen + 4); |
1199 target += 4; | 1197 target += 4; |
1200 #else /* not WIN32_FILENAMES */ | 1198 #else /* not WIN32_FILENAMES */ |
1201 target = (Ibyte *) ALLOCA (tlen); | 1199 target = alloca_ibytes (tlen); |
1202 #endif /* not WIN32_FILENAMES */ | 1200 #endif /* not WIN32_FILENAMES */ |
1203 *target = 0; | 1201 *target = 0; |
1204 | 1202 |
1205 if (newdir) | 1203 if (newdir) |
1206 { | 1204 { |
1560 while (p != endp && (isalnum (*p) || *p == '_')) p++; | 1558 while (p != endp && (isalnum (*p) || *p == '_')) p++; |
1561 s = p; | 1559 s = p; |
1562 } | 1560 } |
1563 | 1561 |
1564 /* Copy out the variable name */ | 1562 /* Copy out the variable name */ |
1565 target = (Ibyte *) ALLOCA (s - o + 1); | 1563 target = alloca_ibytes (s - o + 1); |
1566 qxestrncpy (target, o, s - o); | 1564 qxestrncpy (target, o, s - o); |
1567 target[s - o] = 0; | 1565 target[s - o] = 0; |
1568 #ifdef WIN32_NATIVE | 1566 #ifdef WIN32_NATIVE |
1569 qxestrupr (target); /* $home == $HOME etc. */ | 1567 qxestrupr (target); /* $home == $HOME etc. */ |
1570 #endif /* WIN32_NATIVE */ | 1568 #endif /* WIN32_NATIVE */ |
1579 if (!substituted) | 1577 if (!substituted) |
1580 return filename; | 1578 return filename; |
1581 | 1579 |
1582 /* If substitution required, recopy the filename and do it */ | 1580 /* If substitution required, recopy the filename and do it */ |
1583 /* Make space in stack frame for the new copy */ | 1581 /* Make space in stack frame for the new copy */ |
1584 xnm = (Ibyte *) ALLOCA (XSTRING_LENGTH (filename) + total + 1); | 1582 xnm = alloca_ibytes (XSTRING_LENGTH (filename) + total + 1); |
1585 x = xnm; | 1583 x = xnm; |
1586 | 1584 |
1587 /* Copy the rest of the name through, replacing $ constructs with values */ | 1585 /* Copy the rest of the name through, replacing $ constructs with values */ |
1588 for (p = nm; *p;) | 1586 for (p = nm; *p;) |
1589 if (*p != '$') | 1587 if (*p != '$') |
1611 while (p != endp && (isalnum (*p) || *p == '_')) p++; | 1609 while (p != endp && (isalnum (*p) || *p == '_')) p++; |
1612 s = p; | 1610 s = p; |
1613 } | 1611 } |
1614 | 1612 |
1615 /* Copy out the variable name */ | 1613 /* Copy out the variable name */ |
1616 target = (Ibyte *) ALLOCA (s - o + 1); | 1614 target = alloca_ibytes (s - o + 1); |
1617 qxestrncpy (target, o, s - o); | 1615 qxestrncpy (target, o, s - o); |
1618 target[s - o] = 0; | 1616 target[s - o] = 0; |
1619 #ifdef WIN32_NATIVE | 1617 #ifdef WIN32_NATIVE |
1620 qxestrupr (target); /* $home == $HOME etc. */ | 1618 qxestrupr (target); /* $home == $HOME etc. */ |
1621 #endif /* WIN32_NATIVE */ | 1619 #endif /* WIN32_NATIVE */ |
3135 inserted = XINT (insval); | 3133 inserted = XINT (insval); |
3136 } | 3134 } |
3137 | 3135 |
3138 if (inserted > 0) | 3136 if (inserted > 0) |
3139 { | 3137 { |
3140 Lisp_Object p; | 3138 GC_EXTERNAL_LIST_LOOP_2 (p, Vafter_insert_file_functions) |
3141 struct gcpro ngcpro1; | |
3142 | |
3143 NGCPRO1 (p); | |
3144 EXTERNAL_LIST_LOOP (p, Vafter_insert_file_functions) | |
3145 { | 3139 { |
3146 Lisp_Object insval = | 3140 Lisp_Object insval = call1 (p, make_int (inserted)); |
3147 call1 (XCAR (p), make_int (inserted)); | |
3148 if (!NILP (insval)) | 3141 if (!NILP (insval)) |
3149 { | 3142 { |
3150 CHECK_NATNUM (insval); | 3143 CHECK_NATNUM (insval); |
3151 inserted = XINT (insval); | 3144 inserted = XINT (insval); |
3152 } | 3145 } |
3153 QUIT; | |
3154 } | 3146 } |
3155 NUNGCPRO; | 3147 END_GC_EXTERNAL_LIST_LOOP (p); |
3156 } | 3148 } |
3157 | 3149 |
3158 UNGCPRO; | 3150 UNGCPRO; |
3159 | 3151 |
3160 if (!NILP (val)) | 3152 if (!NILP (val)) |
3664 DEFUN ("encrypt-string", Fencrypt_string, 2, 2, 0, /* | 3656 DEFUN ("encrypt-string", Fencrypt_string, 2, 2, 0, /* |
3665 Encrypt STRING using KEY. | 3657 Encrypt STRING using KEY. |
3666 */ | 3658 */ |
3667 (string, key)) | 3659 (string, key)) |
3668 { | 3660 { |
3661 /* !!#### Needs work */ | |
3669 Extbyte *encrypted_string, *raw_key; | 3662 Extbyte *encrypted_string, *raw_key; |
3670 Extbyte *string_ext, *key_ext; | 3663 Extbyte *string_ext, *key_ext; |
3671 Bytecount string_size_ext, key_size_ext, rounded_size, extra, key_size; | 3664 Bytecount string_size_ext, key_size_ext, rounded_size, extra, key_size; |
3672 | 3665 |
3673 CHECK_STRING (string); | 3666 CHECK_STRING (string); |
4403 This variable affects the built-in functions only on Windows, | 4396 This variable affects the built-in functions only on Windows, |
4404 on other platforms, it is initialized so that Lisp code can find out | 4397 on other platforms, it is initialized so that Lisp code can find out |
4405 what the normal separator is. | 4398 what the normal separator is. |
4406 */ ); | 4399 */ ); |
4407 Vdirectory_sep_char = make_char (DEFAULT_DIRECTORY_SEP); | 4400 Vdirectory_sep_char = make_char (DEFAULT_DIRECTORY_SEP); |
4408 | |
4409 reinit_vars_of_fileio (); | |
4410 } | 4401 } |
4411 | 4402 |
4412 void | 4403 void |
4413 reinit_vars_of_fileio (void) | 4404 reinit_vars_of_fileio (void) |
4414 { | 4405 { |