comparison src/dired.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents a634e3b7acc8
children e7ee5f8bde58
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
1 /* Lisp functions for making directory listings. 1 /* Lisp functions for making directory listings.
2 Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 2001 Ben Wing. 3 Copyright (C) 2001, 2002 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
115 CHECK_STRING (match); 115 CHECK_STRING (match);
116 116
117 /* MATCH might be a flawed regular expression. Rather than 117 /* MATCH might be a flawed regular expression. Rather than
118 catching and signalling our own errors, we just call 118 catching and signalling our own errors, we just call
119 compile_pattern to do the work for us. */ 119 compile_pattern to do the work for us. */
120 bufp = compile_pattern (match, 0, Qnil, 0, ERROR_ME); 120 bufp = compile_pattern (match, 0, Qnil, Qnil, 0, 0, ERROR_ME);
121 } 121 }
122 122
123 /* Now *bufp is the compiled form of MATCH; don't call anything 123 /* Now *bufp is the compiled form of MATCH; don't call anything
124 which might compile a new regexp until we're done with the loop! */ 124 which might compile a new regexp until we're done with the loop! */
125 125
128 unwind-protection in case of error, but now there is. */ 128 unwind-protection in case of error, but now there is. */
129 d = qxe_opendir (XSTRING_DATA (directory)); 129 d = qxe_opendir (XSTRING_DATA (directory));
130 if (!d) 130 if (!d)
131 report_file_error ("Opening directory", directory); 131 report_file_error ("Opening directory", directory);
132 132
133 regex_match_object = Qt;
134 regex_emacs_buffer = current_buffer;
135
136 record_unwind_protect (close_directory_unwind, make_opaque_ptr ((void *)d)); 133 record_unwind_protect (close_directory_unwind, make_opaque_ptr ((void *)d));
137 134
138 /* Loop reading blocks */ 135 /* Loop reading blocks */
139 while (1) 136 while (1)
140 { 137 {
141 DIRENTRY *dp = qxe_readdir (d); 138 DIRENTRY *dp = qxe_readdir (d);
142 int len; 139 int len;
140 struct syntax_cache scache_struct;
141 struct syntax_cache *scache = &scache_struct;
143 142
144 if (!dp) 143 if (!dp)
145 break; 144 break;
146 len = NAMLEN (dp); 145 len = NAMLEN (dp);
147 if (DIRENTRY_NONEMPTY (dp) 146 if (DIRENTRY_NONEMPTY (dp)
148 && (NILP (match) 147 && (NILP (match)
149 || (0 <= re_search (bufp, dp->d_name, len, 0, len, 0)))) 148 || (0 <= re_search (bufp, dp->d_name, len, 0, len, 0, Qnil, 0,
149 scache))))
150 { 150 {
151 if (!NILP (files_only)) 151 if (!NILP (files_only))
152 { 152 {
153 struct stat st; 153 struct stat st;
154 int dir_p = 0; 154 int dir_p = 0;
316 316
317 #ifdef FILE_SYSTEM_CASE 317 #ifdef FILE_SYSTEM_CASE
318 file = FILE_SYSTEM_CASE (file); 318 file = FILE_SYSTEM_CASE (file);
319 #endif 319 #endif
320 directory = Fexpand_file_name (directory, Qnil); 320 directory = Fexpand_file_name (directory, Qnil);
321 file_name_length = XSTRING_CHAR_LENGTH (file); 321 file_name_length = string_char_length (file);
322 322
323 /* With passcount = 0, ignore files that end in an ignored extension. 323 /* With passcount = 0, ignore files that end in an ignored extension.
324 If nothing found then try again with passcount = 1, don't ignore them. 324 If nothing found then try again with passcount = 1, don't ignore them.
325 If looking for all completions, start with passcount = 1, 325 If looking for all completions, start with passcount = 1,
326 so always take even the ignored ones. 326 so always take even the ignored ones.
397 Lisp_Object elt = XCAR (tem); 397 Lisp_Object elt = XCAR (tem);
398 Charcount skip; 398 Charcount skip;
399 399
400 CHECK_STRING (elt); 400 CHECK_STRING (elt);
401 401
402 skip = cclen - XSTRING_CHAR_LENGTH (elt); 402 skip = cclen - string_char_length (elt);
403 if (skip < 0) continue; 403 if (skip < 0) continue;
404 404
405 if (0 > scmp (charptr_n_addr (d_name, skip), 405 if (0 > scmp (charptr_n_addr (d_name, skip),
406 XSTRING_DATA (elt), 406 XSTRING_DATA (elt),
407 XSTRING_CHAR_LENGTH (elt))) 407 string_char_length (elt)))
408 { 408 {
409 ignored_extension_p = 1; 409 ignored_extension_p = 1;
410 break; 410 break;
411 } 411 }
412 } 412 }
438 bestmatch = Fcons (name, bestmatch); 438 bestmatch = Fcons (name, bestmatch);
439 } 439 }
440 else 440 else
441 { 441 {
442 bestmatch = name; 442 bestmatch = name;
443 bestmatchsize = XSTRING_CHAR_LENGTH (name); 443 bestmatchsize = string_char_length (name);
444 } 444 }
445 NUNGCPRO; 445 NUNGCPRO;
446 } 446 }
447 else 447 else
448 { 448 {
459 use it as the best match rather than one that is not 459 use it as the best match rather than one that is not
460 an exact match. This way, we get the case pattern 460 an exact match. This way, we get the case pattern
461 of the actual match. */ 461 of the actual match. */
462 if ((matchsize == cclen 462 if ((matchsize == cclen
463 && matchsize + !!directoryp 463 && matchsize + !!directoryp
464 < XSTRING_CHAR_LENGTH (bestmatch)) 464 < string_char_length (bestmatch))
465 || 465 ||
466 /* If there is no exact match ignoring case, 466 /* If there is no exact match ignoring case,
467 prefer a match that does not change the case 467 prefer a match that does not change the case
468 of the input. */ 468 of the input. */
469 (((matchsize == cclen) 469 (((matchsize == cclen)
470 == 470 ==
471 (matchsize + !!directoryp 471 (matchsize + !!directoryp
472 == XSTRING_CHAR_LENGTH (bestmatch))) 472 == string_char_length (bestmatch)))
473 /* If there is more than one exact match aside from 473 /* If there is more than one exact match aside from
474 case, and one of them is exact including case, 474 case, and one of them is exact including case,
475 prefer that one. */ 475 prefer that one. */
476 && 0 > scmp_1 (p2, XSTRING_DATA (file), 476 && 0 > scmp_1 (p2, XSTRING_DATA (file),
477 file_name_length, 0) 477 file_name_length, 0)
614 614
615 GCPRO2 (user, bestmatch); 615 GCPRO2 (user, bestmatch);
616 616
617 CHECK_STRING (user); 617 CHECK_STRING (user);
618 618
619 user_name_length = XSTRING_CHAR_LENGTH (user); 619 user_name_length = string_char_length (user);
620 620
621 /* Cache user name lookups because it tends to be quite slow. 621 /* Cache user name lookups because it tends to be quite slow.
622 * Rebuild the cache occasionally to catch changes */ 622 * Rebuild the cache occasionally to catch changes */
623 EMACS_GET_TIME (t); 623 EMACS_GET_TIME (t);
624 if (user_cache.user_names && 624 if (user_cache.user_names &&
742 bestmatch = Fcons (name, bestmatch); 742 bestmatch = Fcons (name, bestmatch);
743 } 743 }
744 else 744 else
745 { 745 {
746 bestmatch = name; 746 bestmatch = name;
747 bestmatchsize = XSTRING_CHAR_LENGTH (name); 747 bestmatchsize = string_char_length (name);
748 } 748 }
749 NUNGCPRO; 749 NUNGCPRO;
750 } 750 }
751 else 751 else
752 { 752 {