(vendor-key-syms): Set this variable.

[bpt/emacs.git] / src / dired.c

diff --git a/src/dired.c b/src/dired.c
index 0b9fa43..8ff3864 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -1,5 +1,5 @@
 /* Lisp functions for making directory listings.
-   Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -22,7 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "config.h"
+#include <config.h>
 
 #ifdef VMS
 #include <string.h>
@@ -47,19 +47,31 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <dirent.h>
 #define DIRENTRY struct dirent
 
-#else
+#else /* not SYSV_SYSTEM_DIR */
 
 #ifdef NONSYSTEM_DIR_LIBRARY
 #include "ndir.h"
 #else /* not NONSYSTEM_DIR_LIBRARY */
+#ifdef MSDOS
+#include <dirent.h>
+#else
 #include <sys/dir.h>
+#endif
 #endif /* not NONSYSTEM_DIR_LIBRARY */
 
+#ifndef MSDOS
 #define DIRENTRY struct direct
 
 extern DIR *opendir ();
 extern struct direct *readdir ();
 
+#endif /* not MSDOS */
+#endif /* not SYSV_SYSTEM_DIR */
+
+#ifdef MSDOS
+#define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != 0)
+#else
+#define DIRENTRY_NONEMPTY(p) ((p)->d_ino)
 #endif
 
 #include "lisp.h"
@@ -80,6 +92,7 @@ extern struct re_pattern_buffer searchbuf;
 #define lstat stat
 #endif
 
+extern int completion_ignore_case;
 extern Lisp_Object Ffind_file_name_handler ();
 
 Lisp_Object Vcompletion_ignored_extensions;
@@ -172,7 +185,7 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\
 
       if (!dp) break;
       len = NAMLEN (dp);
-      if (dp->d_ino)
+      if (DIRENTRY_NONEMPTY (dp))
        {
          if (NILP (match)
              || (0 <= re_search (&searchbuf, dp->d_name, len, 0, len, 0)))
@@ -289,6 +302,9 @@ file_name_completion (file, dirname, all_flag, ver_flag)
   CHECK_STRING (file, 0);
 #endif /* not VMS */
 
+#ifdef FILE_SYSTEM_CASE
+  file = FILE_SYSTEM_CASE (file);
+#endif
   dirname = Fexpand_file_name (dirname, Qnil);
   bestmatch = Qnil;
 
@@ -323,7 +339,7 @@ file_name_completion (file, dirname, all_flag, ver_flag)
 
          if (!NILP (Vquit_flag) && NILP (Vinhibit_quit))
            goto quit;
-         if (!dp->d_ino
+         if (! DIRENTRY_NONEMPTY (dp)
              || len < XSTRING (file)->size
              || 0 <= scmp (dp->d_name, XSTRING (file)->data,
                            XSTRING (file)->size))
@@ -392,14 +408,43 @@ file_name_completion (file, dirname, all_flag, ver_flag)
                  matchsize = scmp(p1, p2, compare);
                  if (matchsize < 0)
                    matchsize = compare;
-                 /* If this dirname all matches,
-                    see if implicit following slash does too.  */
+                 if (completion_ignore_case)
+                   {
+                     /* If this is an exact match except for case,
+                        use it as the best match rather than one that is not
+                        an exact match.  This way, we get the case pattern
+                        of the actual match.  */
+                     if ((matchsize == len
+                          && matchsize + !!directoryp 
+                             < XSTRING (bestmatch)->size)
+                         ||
+                         /* If there is no exact match ignoring case,
+                            prefer a match that does not change the case
+                            of the input.  */
+                         (((matchsize == len)
+                           ==
+                           (matchsize + !!directoryp 
+                            == XSTRING (bestmatch)->size))
+                          /* If there is more than one exact match aside from
+                             case, and one of them is exact including case,
+                             prefer that one.  */
+                          && !bcmp (p2, XSTRING (file)->data, XSTRING (file)->size)
+                          && bcmp (p1, XSTRING (file)->data, XSTRING (file)->size)))
+                       {
+                         bestmatch = make_string (dp->d_name, len);
+                         if (directoryp)
+                           bestmatch = Ffile_name_as_directory (bestmatch);
+                       }
+                   }
+
+                 /* If this dirname all matches, see if implicit following
+                    slash does too.  */
                  if (directoryp
                      && compare == matchsize
                      && bestmatchsize > matchsize
                      && p1[matchsize] == '/')
                    matchsize++;
-                 bestmatchsize = min (matchsize, bestmatchsize);
+                 bestmatchsize = matchsize;
                }
            }
        }
@@ -437,7 +482,11 @@ file_name_completion_stat (dirname, dp, st_addr)
   bcopy (dp->d_name, fullname + pos, len);
   fullname[pos + len] = 0;
 
+#ifdef S_IFLNK
+  return lstat (fullname, st_addr);
+#else
   return stat (fullname, st_addr);
+#endif
 }
 \f
 #ifdef VMS
@@ -501,7 +550,7 @@ Otherwise, list elements are:\n\
   First integer has high-order 16 bits of time, second has low 16 bits.\n\
  5. Last modification time, likewise.\n\
  6. Last status change time, likewise.\n\
- 7. Size in bytes.\n\
+ 7. Size in bytes (-1, if number is out of range).\n\
  8. File modes, as a string of ten letters or dashes as in ls -l.\n\
  9. t iff file's gid would change if file were deleted and recreated.\n\
 10. inode number.\n\
@@ -529,6 +578,22 @@ If file does not exist, returns nil.")
   if (lstat (XSTRING (filename)->data, &s) < 0)
     return Qnil;
 
+#ifdef MSDOS
+  {
+    char *tmpnam = XSTRING (Ffile_name_nondirectory (filename))->data;
+    int l = strlen (tmpnam);
+
+    if (l >= 5 
+       && S_ISREG (s.st_mode)
+       && (stricmp (&tmpnam[l - 4], ".com") == 0
+           || stricmp (&tmpnam[l - 4], ".exe") == 0
+           || stricmp (&tmpnam[l - 4], ".bat") == 0))
+      {
+       s.st_mode |= S_IEXEC;
+      }
+  }
+#endif /* MSDOS */
+
   switch (s.st_mode & S_IFMT)
     {
     default:
@@ -546,12 +611,14 @@ If file does not exist, returns nil.")
   values[4] = make_time (s.st_atime);
   values[5] = make_time (s.st_mtime);
   values[6] = make_time (s.st_ctime);
-  /* perhaps we should set this to most-positive-fixnum if it is too large? */
   values[7] = make_number (s.st_size);
+  /* If the size is out of range, give back -1.  */
+  if (XINT (values[7]) != s.st_size)
+    XSETINT (values[7], -1);
   filemodestring (&s, modes);
   values[8] = make_string (modes, 10);
 #ifdef BSD4_3 /* Gross kludge to avoid lack of "#if defined(...)" in VMS */
-#define BSD4_2 /* A new meaning to the term `backwards compatability' */
+#define BSD4_2 /* A new meaning to the term `backwards compatibility' */
 #endif
 #ifdef BSD4_2                  /* file gid will be dir gid */
   dirname = Ffile_name_directory (filename);