/* Lisp functions for making directory listings.
- Copyright (C) 1985-1986, 1993-1994, 1999-2015 Free Software
+ Copyright (C) 1985-1986, 1993-1994, 1999-2016 Free Software
Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "lisp.h"
#include "systime.h"
-#include "character.h"
#include "buffer.h"
-#include "commands.h"
-#include "charset.h"
#include "coding.h"
#include "regex.h"
-#include "blockinput.h"
#ifdef MSDOS
#include "msdos.h" /* for fstatat */
#endif
+#ifdef WINDOWSNT
+extern int is_slow_fs (const char *);
+#endif
+
static ptrdiff_t scmp (const char *, const char *, ptrdiff_t);
static Lisp_Object file_attributes (int, char const *, Lisp_Object);
\f
DIR *d;
int fd, opendir_errno;
- block_input ();
-
#ifdef DOS_NT
/* Directories cannot be opened. The emulation assumes that any
file descriptor other than AT_FDCWD corresponds to the most
}
#endif
- unblock_input ();
-
if (!d)
report_file_errno ("Opening directory", dirname, opendir_errno);
*fdp = fd;
}
#ifdef WINDOWSNT
-void
+static void
directory_files_internal_w32_unwind (Lisp_Object arg)
{
Vw32_get_true_file_attributes = arg;
#endif
static void
-directory_files_internal_unwind (void *dh)
+directory_files_internal_unwind (void *d)
{
- DIR *d = dh;
- block_input ();
closedir (d);
- unblock_input ();
}
/* Return the next directory entry from DIR; DIR's name is DIRNAME.
#ifdef WINDOWSNT
if (attrs)
{
- extern int is_slow_fs (const char *);
-
/* Do this only once to avoid doing it (in w32.c:stat) for each
file in the directory, when we call Ffile_attributes below. */
record_unwind_protect (directory_files_internal_w32_unwind,
{
/* w32.c:stat will notice these bindings and avoid calling
GetDriveType for each file. */
- if (is_slow_fs (SDATA (dirfilename)))
+ if (is_slow_fs (SSDATA (dirfilename)))
Vw32_get_true_file_attributes = Qnil;
else
Vw32_get_true_file_attributes = Qt;
}
}
- block_input ();
closedir (d);
- unblock_input ();
#ifdef WINDOWSNT
if (attrs)
Vw32_get_true_file_attributes = w32_save;
well as "." and "..". Until shown otherwise, assume we can't exclude
anything. */
bool includeall = 1;
+ bool check_decoded = false;
ptrdiff_t count = SPECPDL_INDEX ();
elt = Qnil;
on the encoded file name. */
encoded_file = ENCODE_FILE (file);
encoded_dir = ENCODE_FILE (Fdirectory_file_name (dirname));
+
+ Lisp_Object file_encoding = Vfile_name_coding_system;
+ if (NILP (Vfile_name_coding_system))
+ file_encoding = Vdefault_file_name_coding_system;
+ /* If the file-name encoding decomposes characters, as we do for
+ HFS+ filesystems, we need to make an additional comparison of
+ decoded names in order to filter false positives, such as "a"
+ falsely matching "a-ring". */
+ if (!NILP (file_encoding)
+ && !NILP (Fplist_get (Fcoding_system_plist (file_encoding),
+ Qdecomposed_characters)))
+ {
+ check_decoded = true;
+ if (STRING_MULTIBYTE (file))
+ {
+ /* Recompute FILE to make sure any decomposed characters in
+ it are re-composed by the post-read-conversion.
+ Otherwise, any decomposed characters will be rejected by
+ the additional check below. */
+ file = DECODE_FILE (encoded_file);
+ }
+ }
int fd;
DIR *d = open_directory (encoded_dir, &fd);
record_unwind_protect_ptr (directory_files_internal_unwind, d);
if (!NILP (predicate) && NILP (call1 (predicate, name)))
continue;
+ /* Reject entries where the encoded strings match, but the
+ decoded don't. For example, "a" should not match "a-ring" on
+ file systems that store decomposed characters. */
+ Lisp_Object zero = make_number (0);
+
+ if (check_decoded && SCHARS (file) <= SCHARS (name))
+ {
+ /* FIXME: This is a copy of the code below. */
+ ptrdiff_t compare = SCHARS (file);
+ Lisp_Object cmp
+ = Fcompare_strings (name, zero, make_number (compare),
+ file, zero, make_number (compare),
+ completion_ignore_case ? Qt : Qnil);
+ if (!EQ (cmp, Qt))
+ continue;
+ }
+
/* Suitably record this match. */
matchcount += matchcount <= 1;
}
else
{
- Lisp_Object zero = make_number (0);
/* FIXME: This is a copy of the code in Ftry_completion. */
ptrdiff_t compare = min (bestmatchsize, SCHARS (name));
Lisp_Object cmp
- = Fcompare_strings (bestmatch, zero,
- make_number (compare),
- name, zero,
- make_number (compare),
+ = Fcompare_strings (bestmatch, zero, make_number (compare),
+ name, zero, make_number (compare),
completion_ignore_case ? Qt : Qnil);
ptrdiff_t matchsize = EQ (cmp, Qt) ? compare : eabs (XINT (cmp)) - 1;
default, but we plan to change that, so you should specify a non-nil value
for ID-FORMAT if you use the returned uid or gid.
+To access the elements returned, the following access functions are
+provided: `file-attribute-type', `file-attribute-link-number',
+`file-attribute-user-id', `file-attribute-group-id',
+`file-attribute-access-time', `file-attribute-modification-time',
+`file-attribute-status-change-time', `file-attribute-size',
+`file-attribute-modes', `file-attribute-inode-number', and
+`file-attribute-device-number'.
+
Elements of the attribute list are:
0. t for directory, string (name linked to) for symbolic link, or nil.
1. Number of links to file.
if (!(NILP (id_format) || EQ (id_format, Qinteger)))
{
- block_input ();
uname = stat_uname (&s);
gname = stat_gname (&s);
- unblock_input ();
}
filemodestring (&s, modes);
DEFSYM (Qfile_attributes, "file-attributes");
DEFSYM (Qfile_attributes_lessp, "file-attributes-lessp");
DEFSYM (Qdefault_directory, "default-directory");
+ DEFSYM (Qdecomposed_characters, "decomposed-characters");
defsubr (&Sdirectory_files);
defsubr (&Sdirectory_files_and_attributes);