Mercurial > hg > xemacs-beta
annotate src/dired-msw.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 07 Feb 2011 12:01:24 +0000 |
parents | 16112448d484 |
children | 2aa9cd456ae7 |
rev | line source |
---|---|
428 | 1 /* fast dired replacement routines for mswindows. |
2 Copyright (C) 1998 Darryl Okahata | |
3 Portions Copyright (C) 1992, 1994 by Sebastian Kremer <sk@thp.uni-koeln.de> | |
800 | 4 Copyright (C) 2000, 2001, 2002 Ben Wing. |
428 | 5 |
6 This file is part of XEmacs. | |
7 | |
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 | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
771 | 25 |
428 | 26 /* |
27 * Parts of this code (& comments) were taken from ls-lisp.el | |
28 * Author: Sebastian Kremer <sk@thp.uni-koeln.de> | |
29 */ | |
30 | |
31 /* | |
32 * insert-directory | |
33 * - must insert _exactly_one_line_ describing FILE if WILDCARD and | |
34 * FULL-DIRECTORY-P is nil. | |
35 * The single line of output must display FILE's name as it was | |
36 * given, namely, an absolute path name. | |
37 * - must insert exactly one line for each file if WILDCARD or | |
38 * FULL-DIRECTORY-P is t, plus one optional "total" line | |
39 * before the file lines, plus optional text after the file lines. | |
40 * Lines are delimited by "\n", so filenames containing "\n" are not | |
41 * allowed. | |
42 * File lines should display the basename. | |
43 * - must be consistent with | |
44 * - functions dired-move-to-filename, (these two define what a file line is) | |
45 * dired-move-to-end-of-filename, | |
46 * dired-between-files, (shortcut for (not (dired-move-to-filename))) | |
47 * dired-insert-headerline | |
48 * dired-after-subdir-garbage (defines what a "total" line is) | |
49 * - variable dired-subdir-regexp | |
50 */ | |
51 | |
52 /* | |
53 * Insert directory listing for FILE, formatted according to SWITCHES. | |
54 * Leaves point after the inserted text. | |
55 * SWITCHES may be a string of options, or a list of strings. | |
56 * Optional third arg WILDCARD means treat FILE as shell wildcard. | |
57 * Optional fourth arg FULL-DIRECTORY-P means file is a directory and | |
58 * switches do not contain `d', so that a full listing is expected. | |
59 * | |
60 * This works by running a directory listing program | |
61 * whose name is in the variable `insert-directory-program'. | |
62 * If WILDCARD, it also runs the shell specified by `shell-file-name'." | |
63 */ | |
64 | |
65 /* | |
66 * Set INDENT_LISTING to non-zero if the inserted text should be shifted | |
67 * over by two spaces. | |
68 */ | |
771 | 69 #define INDENT_LISTING 0 |
428 | 70 |
771 | 71 #define ROUND_FILE_SIZES 4096 |
428 | 72 |
73 | |
74 #include <config.h> | |
75 #include "lisp.h" | |
76 | |
77 #include "buffer.h" | |
78 #include "regex.h" | |
826 | 79 #include "syntax.h" |
428 | 80 |
872 | 81 #include "console-msw.h" |
82 | |
428 | 83 #include "sysdir.h" |
442 | 84 #include "sysfile.h" |
558 | 85 #include "sysfloat.h" |
771 | 86 #include "sysproc.h" |
87 #include "syspwd.h" | |
88 #include "systime.h" | |
872 | 89 |
428 | 90 |
91 static int mswindows_ls_sort_case_insensitive; | |
458 | 92 static Fixnum mswindows_ls_round_file_size; |
428 | 93 |
771 | 94 Lisp_Object Qmswindows_insert_directory; |
95 Lisp_Object Qwildcard_to_regexp; | |
428 | 96 |
771 | 97 extern Lisp_Object Vmswindows_downcase_file_names; /* in device-msw.c */ |
428 | 98 |
558 | 99 enum mswindows_sortby |
100 { | |
428 | 101 MSWINDOWS_SORT_BY_NAME, |
102 MSWINDOWS_SORT_BY_NAME_NOCASE, | |
103 MSWINDOWS_SORT_BY_MOD_DATE, | |
104 MSWINDOWS_SORT_BY_SIZE | |
105 }; | |
106 | |
107 | |
771 | 108 static enum mswindows_sortby mswindows_sort_method; |
109 static int mswindows_reverse_sort; | |
110 | |
111 /* We create our own structure because the cFileName field in | |
112 WIN32_FIND_DATA is in external format and of fixed size, which we | |
113 may exceed when translating. */ | |
114 | |
115 typedef struct | |
116 { | |
117 DWORD dwFileAttributes; | |
118 FILETIME ftCreationTime; | |
119 FILETIME ftLastAccessTime; | |
120 FILETIME ftLastWriteTime; | |
121 DWORD nFileSizeHigh; | |
122 DWORD nFileSizeLow; | |
867 | 123 Ibyte *cFileName; |
771 | 124 } Win32_file; |
125 | |
126 typedef struct | |
127 { | |
128 Dynarr_declare (Win32_file); | |
129 } Win32_file_dynarr; | |
130 | |
428 | 131 |
132 | |
133 #define CMPDWORDS(t1a, t1b, t2a, t2b) \ | |
134 (((t1a) == (t2a)) ? (((t1b) == (t2b)) ? 0 : (((t1b) < (t2b)) ? -1 : 1)) \ | |
135 : (((t1a) < (t2a)) ? -1 : 1)) | |
136 | |
137 | |
138 static int | |
139 mswindows_ls_sort_fcn (const void *elem1, const void *elem2) | |
140 { | |
771 | 141 Win32_file *e1, *e2; |
142 int status; | |
428 | 143 |
771 | 144 e1 = (Win32_file *) elem1; |
145 e2 = (Win32_file *) elem2; | |
146 | |
428 | 147 switch (mswindows_sort_method) |
148 { | |
149 case MSWINDOWS_SORT_BY_NAME: | |
1204 | 150 status = qxestrcmp (e1->cFileName, e2->cFileName); |
428 | 151 break; |
152 case MSWINDOWS_SORT_BY_NAME_NOCASE: | |
771 | 153 status = qxestrcasecmp (e1->cFileName, e2->cFileName); |
428 | 154 break; |
155 case MSWINDOWS_SORT_BY_MOD_DATE: | |
771 | 156 status = CMPDWORDS (e1->ftLastWriteTime.dwHighDateTime, |
157 e1->ftLastWriteTime.dwLowDateTime, | |
158 e2->ftLastWriteTime.dwHighDateTime, | |
159 e2->ftLastWriteTime.dwLowDateTime); | |
428 | 160 break; |
161 case MSWINDOWS_SORT_BY_SIZE: | |
771 | 162 status = CMPDWORDS (e1->nFileSizeHigh, e1->nFileSizeLow, |
163 e2->nFileSizeHigh, e2->nFileSizeLow); | |
428 | 164 break; |
165 default: | |
166 status = 0; | |
167 break; | |
168 } | |
169 if (mswindows_reverse_sort) | |
170 { | |
171 status = -status; | |
172 } | |
173 return (status); | |
174 } | |
175 | |
176 static void | |
771 | 177 mswindows_sort_files (Win32_file_dynarr *files, |
428 | 178 enum mswindows_sortby sort_by, int reverse) |
179 { | |
180 mswindows_sort_method = sort_by; | |
181 mswindows_reverse_sort = reverse; | |
4967 | 182 qsort (Dynarr_begin (files), Dynarr_length (files), |
771 | 183 sizeof (Win32_file), mswindows_ls_sort_fcn); |
428 | 184 } |
185 | |
771 | 186 static Win32_file_dynarr * |
187 mswindows_get_files (Lisp_Object dirfile, int nowild, Lisp_Object pattern, | |
188 int hide_dot, int hide_system) | |
428 | 189 { |
771 | 190 Win32_file_dynarr *files = Dynarr_new (Win32_file); |
191 struct re_pattern_buffer *bufp = NULL; | |
192 int findex; | |
193 DECLARE_EISTRING (win32pattern); | |
194 HANDLE fh; | |
2526 | 195 int errm; |
428 | 196 |
197 while (1) | |
198 { | |
771 | 199 if (!NILP (pattern)) |
428 | 200 { |
201 /* PATTERN might be a flawed regular expression. Rather than | |
202 catching and signalling our own errors, we just call | |
203 compile_pattern to do the work for us. */ | |
826 | 204 bufp = compile_pattern (pattern, 0, Qnil, Qnil, 0, 0, ERROR_ME); |
428 | 205 } |
206 /* Now *bufp is the compiled form of PATTERN; don't call anything | |
207 which might compile a new regexp until we're done with the loop! */ | |
208 | |
2526 | 209 { |
210 Ibyte *dir2; | |
211 LISP_PATHNAME_RESOLVE_LINKS (dirfile, dir2); | |
212 eicpy_rawz (win32pattern, dir2); | |
213 } | |
214 | |
428 | 215 /* for Win32, we need to insure that the pathname ends with "\*". */ |
216 if (!nowild) | |
217 { | |
771 | 218 Charcount len = eicharlen (win32pattern) - 1; |
219 if (!IS_DIRECTORY_SEP (eigetch_char (win32pattern, len))) | |
2421 | 220 eicat_ascii (win32pattern, "\\"); |
221 eicat_ascii (win32pattern, "*"); | |
428 | 222 } |
771 | 223 eito_external (win32pattern, Qmswindows_tstr); |
428 | 224 |
225 /* | |
226 * Here, we use FindFirstFile()/FindNextFile() instead of opendir(), | |
771 | 227 * qxe_stat(), & friends, because qxe_stat() is VERY expensive in |
442 | 228 * terms of time. Hence, we take the time to write complicated |
229 * Win32-specific code, instead of simple Unix-style stuff. | |
428 | 230 */ |
231 findex = 0; | |
232 fh = INVALID_HANDLE_VALUE; | |
819 | 233 errm = SetErrorMode (SEM_FAILCRITICALERRORS |
234 | SEM_NOOPENFILEERRORBOX); | |
428 | 235 |
236 while (1) | |
237 { | |
771 | 238 Bytecount len; |
239 DECLARE_EISTRING (filename); | |
240 int result; | |
241 WIN32_FIND_DATAW finddat; | |
242 Win32_file file; | |
826 | 243 struct syntax_cache scache_struct; |
244 struct syntax_cache *scache = &scache_struct; | |
428 | 245 |
246 if (fh == INVALID_HANDLE_VALUE) | |
247 { | |
771 | 248 fh = qxeFindFirstFile (eiextdata (win32pattern), &finddat); |
428 | 249 if (fh == INVALID_HANDLE_VALUE) |
819 | 250 { |
251 SetErrorMode (errm); | |
252 report_file_error ("Opening directory", dirfile); | |
253 } | |
428 | 254 } |
255 else | |
256 { | |
771 | 257 if (! qxeFindNextFile (fh, &finddat)) |
428 | 258 { |
819 | 259 if (GetLastError() == ERROR_NO_MORE_FILES) |
260 { | |
261 break; | |
262 } | |
263 FindClose(fh); | |
264 SetErrorMode (errm); | |
771 | 265 report_file_error ("Reading directory", dirfile); |
428 | 266 } |
267 } | |
268 | |
771 | 269 file.dwFileAttributes = finddat.dwFileAttributes; |
270 file.ftCreationTime = finddat.ftCreationTime; | |
271 file.ftLastAccessTime = finddat.ftLastAccessTime; | |
272 file.ftLastWriteTime = finddat.ftLastWriteTime; | |
273 file.nFileSizeHigh = finddat.nFileSizeHigh; | |
274 file.nFileSizeLow = finddat.nFileSizeLow; | |
275 eicpy_ext (filename, (Extbyte *) finddat.cFileName, | |
276 Qmswindows_tstr); | |
277 | |
278 if (!NILP (Vmswindows_downcase_file_names)) | |
279 eilwr (filename); | |
280 len = eilen (filename); | |
281 result = (NILP (pattern) | |
1204 | 282 || (0 <= re_search (bufp, (char *) eidata (filename), |
826 | 283 len, 0, len, 0, Qnil, 0, scache))); |
428 | 284 if (result) |
285 { | |
771 | 286 if ( ! (eigetch_char (filename, 0) == '.' && |
287 ((hide_system && | |
288 (eigetch_char (filename, 1) == '\0' || | |
289 (eigetch_char (filename, 1) == '.' && | |
290 eigetch_char (filename, 2) == '\0'))) || | |
428 | 291 hide_dot))) |
292 { | |
2367 | 293 file.cFileName = xnew_ibytes (len + ITEXT_ZTERM_SIZE); |
771 | 294 memcpy (file.cFileName, eidata (filename), len); |
295 file.cFileName[len] = '\0'; | |
296 Dynarr_add (files, file); | |
428 | 297 } |
298 } | |
299 } | |
300 if (fh != INVALID_HANDLE_VALUE) | |
771 | 301 FindClose (fh); |
428 | 302 break; |
303 } | |
819 | 304 |
305 SetErrorMode (errm); | |
428 | 306 return (files); |
307 } | |
308 | |
771 | 309 static Lisp_Object |
310 mswindows_format_file (Win32_file *file, int display_size, int add_newline) | |
428 | 311 { |
771 | 312 Lisp_Object luser; |
313 double file_size; | |
314 DECLARE_EISTRING (puta); | |
867 | 315 CIbyte buf[666]; |
428 | 316 |
317 file_size = | |
318 file->nFileSizeHigh * (double)UINT_MAX + file->nFileSizeLow; | |
319 #if INDENT_LISTING | |
2421 | 320 eicat_ascii (puta, " "); |
428 | 321 #endif |
322 if (display_size) | |
323 { | |
771 | 324 sprintf (buf, "%6d ", (int)((file_size + 1023.) / 1024.)); |
2421 | 325 eicat_ascii (puta, buf); |
428 | 326 } |
327 if (file->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) | |
2421 | 328 eicat_ascii (puta, "d"); |
771 | 329 else |
2421 | 330 eicat_ascii (puta, "-"); |
771 | 331 buf[0] = buf[3] = buf[6] = 'r'; |
428 | 332 if (file->dwFileAttributes & FILE_ATTRIBUTE_READONLY) |
771 | 333 buf[1] = buf[4] = buf[7] = '-'; |
334 else | |
335 buf[1] = buf[4] = buf[7] = 'w'; | |
336 { | |
337 int is_executable = 0; | |
428 | 338 |
771 | 339 if (file->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) |
340 is_executable = 1; | |
341 else if (qxestrcharlen (file->cFileName) > 4) | |
342 { | |
867 | 343 Ibyte *end = file->cFileName + qxestrlen (file->cFileName); |
344 DEC_IBYTEPTR (end); | |
345 DEC_IBYTEPTR (end); | |
346 DEC_IBYTEPTR (end); | |
347 DEC_IBYTEPTR (end); | |
2367 | 348 if (qxestrcasecmp_ascii (end, ".exe") == 0 |
349 || qxestrcasecmp_ascii (end, ".com") == 0 | |
350 || qxestrcasecmp_ascii (end, ".bat") == 0 | |
428 | 351 #if 0 |
2367 | 352 || qxestrcasecmp_ascii (end, ".pif") == 0 |
428 | 353 #endif |
771 | 354 ) |
355 is_executable = 1; | |
428 | 356 } |
771 | 357 if (is_executable) |
358 buf[2] = buf[5] = buf[8] = 'x'; | |
359 else | |
360 buf[2] = buf[5] = buf[8] = '-'; | |
428 | 361 } |
771 | 362 buf[9] = '\0'; |
2421 | 363 eicat_ascii (puta, buf); |
771 | 364 if (file->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) |
2421 | 365 eicat_ascii (puta, " 2 "); |
771 | 366 else |
2421 | 367 eicat_ascii (puta, " 1 "); |
771 | 368 luser = Fuser_login_name (Qnil); |
369 if (!STRINGP (luser)) | |
370 sprintf (buf, "%-9d", 0); | |
428 | 371 else |
372 { | |
867 | 373 Ibyte *str; |
771 | 374 |
375 str = XSTRING_DATA (luser); | |
376 sprintf (buf, "%-8s ", str); | |
428 | 377 } |
867 | 378 eicat_raw (puta, (Ibyte *) buf, strlen (buf)); |
771 | 379 { |
867 | 380 CIbyte *cptr = buf; |
771 | 381 sprintf (buf, "%-8d ", getgid ()); |
382 cptr += 9; | |
383 if (file_size > 99999999.0) | |
384 { | |
385 file_size = (file_size + 1023.0) / 1024.; | |
386 if (file_size > 999999.0) | |
387 sprintf (cptr, "%6.0fMB ", (file_size + 1023.0) / 1024.); | |
388 else | |
389 sprintf (cptr, "%6.0fKB ", file_size); | |
390 } | |
391 else | |
392 sprintf (cptr, "%8.0f ", file_size); | |
393 while (*cptr) | |
394 ++cptr; | |
395 { | |
396 time_t t, now; | |
867 | 397 Ibyte *ctimebuf; |
771 | 398 |
399 if ( | |
400 #if 0 | |
401 /* | |
402 * This doesn't work. | |
403 * This code should be correct ... | |
404 */ | |
405 FileTimeToLocalFileTime (&file->ftLastWriteTime, &localtime) && | |
406 ((t = mswindows_convert_time (localtime)) != 0) && | |
407 #else | |
408 /* | |
409 * But this code "works" ... | |
410 */ | |
411 ((t = mswindows_convert_time (file->ftLastWriteTime)) != 0) && | |
412 #endif | |
413 ((ctimebuf = qxe_ctime (&t)) != NULL)) | |
414 { | |
415 memcpy (cptr, &ctimebuf[4], 7); | |
416 now = time (NULL); | |
417 if (now - t > (365. / 2.0) * 86400.) | |
418 { | |
419 /* more than 6 months */ | |
420 cptr[7] = ' '; | |
421 memcpy (&cptr[8], &ctimebuf[20], 4); | |
422 } | |
423 else | |
424 { | |
425 /* less than 6 months */ | |
426 memcpy (&cptr[7], &ctimebuf[11], 5); | |
427 } | |
428 cptr += 12; | |
429 *cptr++ = ' '; | |
430 *cptr++ = '\0'; | |
431 } | |
432 } | |
433 } | |
434 | |
2421 | 435 eicat_ascii (puta, buf); |
771 | 436 eicat_raw (puta, file->cFileName, qxestrlen (file->cFileName)); |
437 if (add_newline) | |
2421 | 438 eicat_ascii (puta, "\n"); |
771 | 439 |
440 return eimake_string (puta); | |
428 | 441 } |
442 | |
443 | |
444 DEFUN ("mswindows-insert-directory", Fmswindows_insert_directory, 2, 4, 0, /* | |
445 Insert directory listing for FILE, formatted according to SWITCHES. | |
446 Leaves point after the inserted text. | |
447 SWITCHES may be a string of options, or a list of strings. | |
448 Optional third arg WILDCARD means treat FILE as shell wildcard. | |
449 Optional fourth arg FULL-DIRECTORY-P means file is a directory and | |
450 switches do not contain `d', so that a full listing is expected. | |
451 */ | |
452 (file, switches, wildcard, full_directory_p)) | |
453 { | |
771 | 454 Lisp_Object handler, wildpat = Qnil, basename = Qnil; |
455 int nfiles = 0, i; | |
456 int hide_system = 1, hide_dot = 1, reverse = 0, display_size = 0; | |
457 Win32_file_dynarr *files; | |
458 enum mswindows_sortby sort_by = | |
459 (mswindows_ls_sort_case_insensitive ? MSWINDOWS_SORT_BY_NAME_NOCASE | |
460 : MSWINDOWS_SORT_BY_NAME); | |
461 struct gcpro gcpro1, gcpro2, gcpro3; | |
462 | |
463 GCPRO3 (file, wildpat, basename); | |
464 | |
465 CHECK_STRING (file); | |
466 if (!NILP (wildpat)) | |
467 CHECK_STRING (wildpat); | |
428 | 468 |
771 | 469 handler = Ffind_file_name_handler (file, Qmswindows_insert_directory); |
470 if (!NILP (handler)) | |
471 { | |
472 UNGCPRO; | |
473 return call5 (handler, Qmswindows_insert_directory, file, switches, | |
474 wildcard, full_directory_p); | |
475 } | |
476 | |
477 if (!NILP (switches)) | |
428 | 478 { |
867 | 479 Ibyte *cptr, *cptr_end; |
771 | 480 |
481 CHECK_STRING (switches); | |
482 cptr = XSTRING_DATA (switches); | |
483 cptr_end = cptr + XSTRING_LENGTH (switches); | |
484 while (cptr < cptr_end) | |
428 | 485 { |
867 | 486 Ichar ch = itext_ichar (cptr); |
771 | 487 switch (ch) |
428 | 488 { |
771 | 489 case 'A': |
490 hide_dot = 0; | |
491 break; | |
492 case 'a': | |
493 hide_system = 0; | |
494 hide_dot = 0; | |
495 break; | |
496 case 'r': | |
497 reverse = 1; | |
498 break; | |
499 case 's': | |
500 display_size = 1; | |
501 break; | |
502 case 'S': | |
503 sort_by = MSWINDOWS_SORT_BY_SIZE; | |
504 break; | |
505 case 't': | |
506 sort_by = MSWINDOWS_SORT_BY_MOD_DATE; | |
428 | 507 break; |
508 } | |
867 | 509 INC_IBYTEPTR (cptr); |
428 | 510 } |
771 | 511 } |
512 | |
513 if (!NILP (wildcard)) | |
514 { | |
515 Lisp_Object newfile; | |
516 | |
517 file = Fdirectory_file_name (file); | |
518 basename = Ffile_name_nondirectory (file); | |
519 wildpat = call1 (Qwildcard_to_regexp, basename); | |
520 newfile = Ffile_name_directory (file); | |
521 if (NILP (newfile)) | |
522 newfile = Ffile_name_directory (Fexpand_file_name (file, Qnil)); | |
523 file = newfile; | |
524 } | |
525 | |
526 files = mswindows_get_files (file, | |
527 NILP (wildcard) && NILP (full_directory_p), | |
528 wildpat, hide_dot, hide_system); | |
529 | |
530 if (Dynarr_length (files) > 1) | |
531 mswindows_sort_files (files, sort_by, reverse); | |
532 if (!NILP (wildcard) || !NILP (full_directory_p)) | |
533 { | |
534 /* | |
535 * By using doubles, we can handle files up to 2^53 bytes in | |
536 * size (IEEE doubles have 53 bits of resolution). However, | |
537 * as we divide by 1024 (or 2^10), the total size is | |
538 * accurate up to 2^(53+10) --> 2^63 bytes. | |
539 * | |
540 * Hopefully, we won't have to handle these file sizes anytime | |
541 * soon. | |
542 */ | |
543 double total_size, file_size, block_size; | |
428 | 544 |
771 | 545 if ((block_size = mswindows_ls_round_file_size) <= 0) |
546 { | |
547 block_size = 0; | |
548 } | |
549 total_size = 0; | |
550 for (i = 0; i < Dynarr_length (files); ++i) | |
551 { | |
552 Win32_file *file = Dynarr_atp (files, i); | |
553 file_size = | |
554 file->nFileSizeHigh * (double)UINT_MAX + | |
555 file->nFileSizeLow; | |
556 if (block_size > 0) | |
428 | 557 { |
771 | 558 /* |
559 * Round file_size up to the next nearest block size. | |
560 */ | |
428 | 561 file_size = |
771 | 562 floor ((file_size + block_size - 1) / block_size) |
563 * block_size; | |
428 | 564 } |
771 | 565 /* Here, we round to the nearest 1K */ |
566 total_size += floor ((file_size + 512.) / 1024.); | |
428 | 567 } |
771 | 568 { |
800 | 569 write_fmt_string (wrap_buffer (current_buffer), |
771 | 570 #if INDENT_LISTING |
800 | 571 /* ANSI C compilers auto-concatenate adjacent |
572 strings */ | |
573 " " | |
771 | 574 #endif |
800 | 575 "total %.0f\n", total_size); |
771 | 576 } |
428 | 577 } |
771 | 578 for (i = 0; i < Dynarr_length (files); ++i) |
428 | 579 { |
771 | 580 struct gcpro ngcpro1; |
581 Lisp_Object fmtfile = | |
582 mswindows_format_file (Dynarr_atp (files, i), display_size, TRUE); | |
583 NGCPRO1 (fmtfile); | |
584 buffer_insert1 (current_buffer, fmtfile); | |
585 NUNGCPRO; | |
428 | 586 } |
771 | 587 for (i = 0; i < Dynarr_length (files); ++i) |
588 { | |
589 Win32_file *file = Dynarr_atp (files, i); | |
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4967
diff
changeset
|
590 xfree (file->cFileName); |
771 | 591 } |
592 Dynarr_free (files); | |
593 | |
428 | 594 UNGCPRO; |
771 | 595 return Qnil; |
428 | 596 } |
597 | |
598 | |
599 | |
600 /************************************************************************/ | |
601 /* initialization */ | |
602 /************************************************************************/ | |
603 | |
604 void | |
605 syms_of_dired_mswindows (void) | |
606 { | |
563 | 607 DEFSYMBOL (Qmswindows_insert_directory); |
771 | 608 DEFSYMBOL (Qwildcard_to_regexp); |
428 | 609 |
610 DEFSUBR (Fmswindows_insert_directory); | |
611 } | |
612 | |
613 | |
614 void | |
615 vars_of_dired_mswindows (void) | |
616 { | |
771 | 617 DEFVAR_BOOL ("mswindows-ls-sort-case-insensitive", |
618 &mswindows_ls_sort_case_insensitive /* | |
428 | 619 *Non-nil means filenames are sorted in a case-insensitive fashion. |
620 Nil means filenames are sorted in a case-sensitive fashion, just like Unix. | |
621 */ ); | |
622 mswindows_ls_sort_case_insensitive = 1; | |
623 | |
624 DEFVAR_INT ("mswindows-ls-round-file-size", &mswindows_ls_round_file_size /* | |
625 *If non-zero, file sizes are rounded in terms of this block size when | |
626 the file totals are being calculated. This is useful for getting a more | |
627 accurate estimate of allocated disk space. Note that this only affects | |
628 the total size calculation; the individual displayed file sizes are not | |
629 changed. This block size should also be a power of 2 (but this is not | |
630 enforced), as filesystem block (cluster) sizes are typically powers-of-2. | |
631 */ ); | |
632 /* | |
633 * Here, we choose 4096 because it's the cluster size for both FAT32 | |
634 * and NTFS (?). This is probably much too small for people using | |
635 * plain FAT, but, hopefully, plain FAT will go away someday. | |
636 * | |
637 * We should allow something like a alist here, to make the size | |
638 * dependent on the drive letter, etc.. | |
639 */ | |
640 mswindows_ls_round_file_size = 4096; | |
641 } |