diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-22 10:32:51 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-22 10:32:51 -0800 |
| commit | 8d40723d1e9661840a67ca7be9c5b073526ab421 (patch) | |
| tree | bc63b88782710c46ddb3b269a6b0b5f355048ad5 | |
| parent | 5f9d345ca90b78184fd8b142310e43f23e529120 (diff) | |
| download | emacs-8d40723d1e9661840a67ca7be9c5b073526ab421.tar.gz | |
* dired.c (Ffile_attributes): Simplify and avoid #ifdef.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dired.c | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 097742c7103..8befb78f91f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-02-22 Paul Eggert <eggert@cs.ucla.edu> + + * dired.c (Ffile_attributes): Simplify and avoid #ifdef. + 2011-02-22 Wolfgang Jenkner <wjenkner@inode.at> (tiny change) * lread.c (openp): Correct Boolean typo in last commit. diff --git a/src/dired.c b/src/dired.c index 92c12846558..eea4c7cfe40 100644 --- a/src/dired.c +++ b/src/dired.c @@ -963,17 +963,8 @@ so last access time will always be midnight of that day. */) if (lstat (SSDATA (encoded), &s) < 0) return Qnil; - switch (s.st_mode & S_IFMT) - { - default: - values[0] = Qnil; break; - case S_IFDIR: - values[0] = Qt; break; -#ifdef S_IFLNK - case S_IFLNK: - values[0] = Ffile_symlink_p (filename); break; -#endif - } + values[0] = (S_ISLNK (s.st_mode) ? Ffile_symlink_p (filename) + : S_ISDIR (s.st_mode) ? Qt : Qnil); values[1] = make_number (s.st_nlink); if (!(NILP (id_format) || EQ (id_format, Qinteger))) |