X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/04924ee3f480147b84cb3485a5cdd919725d59dd..82ead4b1427e6804c18ed7acb7c8e99a93059af0:/src/dired.c diff --git a/src/dired.c b/src/dired.c index 1e7c9a8022..e833ceb216 100644 --- a/src/dired.c +++ b/src/dired.c @@ -1,5 +1,6 @@ /* Lisp functions for making directory listings. - Copyright (C) 1985, 1986, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1999, 2000, 2001, 2004 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -25,12 +26,26 @@ Boston, MA 02111-1307, USA. */ #include #include +#ifdef VMS +#include "vms-pwd.h" +#else +#include +#include +#endif + +#include "systime.h" +#include + #ifdef VMS #include #include #include #endif +#ifdef HAVE_UNISTD_H +#include +#endif + /* The d_nameln member of a struct dirent includes the '\0' character on some systems, but not on others. What's worse, you can't tell at compile-time which one it will be, since it really depends on @@ -60,6 +75,8 @@ Boston, MA 02111-1307, USA. */ #endif #endif /* not NONSYSTEM_DIR_LIBRARY */ +#include + #ifndef MSDOS #define DIRENTRY struct direct @@ -78,13 +95,15 @@ extern struct direct *readdir (); #include "lisp.h" #include "buffer.h" #include "commands.h" - +#include "charset.h" +#include "coding.h" #include "regex.h" /* Returns a search buffer, with a fastmap allocated and ready to go. */ extern struct re_pattern_buffer *compile_pattern (); -#define min(a, b) ((a) < (b) ? (a) : (b)) +/* From filemode.c. Can't go in Lisp.h because of `stat'. */ +extern void filemodestring P_ ((struct stat *, char *)); /* if system does not have symbolic links, it does not have lstat. In that case, use ordinary stat instead. */ @@ -95,75 +114,79 @@ extern struct re_pattern_buffer *compile_pattern (); extern int completion_ignore_case; extern Lisp_Object Vcompletion_regexp_list; +extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system; Lisp_Object Vcompletion_ignored_extensions; Lisp_Object Qcompletion_ignore_case; Lisp_Object Qdirectory_files; +Lisp_Object Qdirectory_files_and_attributes; Lisp_Object Qfile_name_completion; Lisp_Object Qfile_name_all_completions; Lisp_Object Qfile_attributes; +Lisp_Object Qfile_attributes_lessp; + +static int scmp P_ ((unsigned char *, unsigned char *, int)); -DEFUN ("directory-files", Fdirectory_files, Sdirectory_files, 1, 4, 0, - "Return a list of names of files in DIRECTORY.\n\ -There are three optional arguments:\n\ -If FULL is non-nil, return absolute file names. Otherwise return names\n\ - that are relative to the specified directory.\n\ -If MATCH is non-nil, mention only file names that match the regexp MATCH.\n\ -If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\ - NOSORT is useful if you plan to sort the result yourself.") - (directory, full, match, nosort) - Lisp_Object directory, full, match, nosort; + +Lisp_Object +directory_files_internal_unwind (dh) + Lisp_Object dh; { - DIR *d; - int dirnamelen; - Lisp_Object list, name, dirfilename; - Lisp_Object handler; - struct re_pattern_buffer *bufp; + DIR *d = (DIR *) ((XINT (XCAR (dh)) << 16) + XINT (XCDR (dh))); + closedir (d); + return Qnil; +} - /* If the file name has special constructs in it, - call the corresponding file handler. */ - handler = Ffind_file_name_handler (directory, Qdirectory_files); - if (!NILP (handler)) - { - Lisp_Object args[6]; - - args[0] = handler; - args[1] = Qdirectory_files; - args[2] = directory; - args[3] = full; - args[4] = match; - args[5] = nosort; - return Ffuncall (6, args); - } +/* Function shared by Fdirectory_files and Fdirectory_files_and_attributes. + When ATTRS is zero, return a list of directory filenames; when + non-zero, return a list of directory filenames and their attributes. + In the latter case, ID_FORMAT is passed to Ffile_attributes. */ - { - struct gcpro gcpro1, gcpro2; +Lisp_Object +directory_files_internal (directory, full, match, nosort, attrs, id_format) + Lisp_Object directory, full, match, nosort; + int attrs; + Lisp_Object id_format; +{ + DIR *d; + int directory_nbytes; + Lisp_Object list, dirfilename, encoded_directory; + struct re_pattern_buffer *bufp = NULL; + int needsep = 0; + int count = SPECPDL_INDEX (); + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; + DIRENTRY *dp; + int retry_p; - /* Because of file name handlers, these functions might call + /* Because of file name handlers, these functions might call Ffuncall, and cause a GC. */ - GCPRO1 (match); - directory = Fexpand_file_name (directory, Qnil); - UNGCPRO; - GCPRO2 (match, directory); - dirfilename = Fdirectory_file_name (directory); - UNGCPRO; - } + list = encoded_directory = dirfilename = Qnil; + GCPRO5 (match, directory, list, dirfilename, encoded_directory); + dirfilename = Fdirectory_file_name (directory); if (!NILP (match)) { - CHECK_STRING (match, 3); + CHECK_STRING (match); /* MATCH might be a flawed regular expression. Rather than catching and signaling our own errors, we just call compile_pattern to do the work for us. */ + /* Pass 1 for the MULTIBYTE arg + because we do make multibyte strings if the contents warrant. */ #ifdef VMS bufp = compile_pattern (match, 0, - buffer_defaults.downcase_table->contents, 0); + buffer_defaults.downcase_table, 0, 1); #else - bufp = compile_pattern (match, 0, 0, 0); + bufp = compile_pattern (match, 0, Qnil, 0, 1); #endif } + /* Note: ENCODE_FILE and DECODE_FILE can GC because they can run + run_pre_post_conversion_on_str which calls Lisp directly and + indirectly. */ + dirfilename = ENCODE_FILE (dirfilename); + encoded_directory = ENCODE_FILE (directory); + /* Now *bufp is the compiled form of MATCH; don't call anything which might compile a new regexp until we're done with the loop! */ @@ -171,69 +194,218 @@ If NOSORT is non-nil, the list is not sorted--its order is unpredictable.\n\ an error is signaled while the directory stream is open, we have to make sure it gets closed, and setting up an unwind_protect to do so would be a pain. */ - d = opendir (XSTRING (dirfilename)->data); - if (! d) + retry: + + d = opendir (SDATA (dirfilename)); + if (d == NULL) report_file_error ("Opening directory", Fcons (directory, Qnil)); - list = Qnil; - dirnamelen = XSTRING (directory)->size; + /* Unfortunately, we can now invoke expand-file-name and + file-attributes on filenames, both of which can throw, so we must + do a proper unwind-protect. */ + record_unwind_protect (directory_files_internal_unwind, + Fcons (make_number (((unsigned long) d) >> 16), + make_number (((unsigned long) d) & 0xffff))); + + directory_nbytes = SBYTES (directory); + re_match_object = Qt; - /* Loop reading blocks */ - while (1) + /* Decide whether we need to add a directory separator. */ +#ifndef VMS + if (directory_nbytes == 0 + || !IS_ANY_SEP (SREF (directory, directory_nbytes - 1))) + needsep = 1; +#endif /* not VMS */ + + /* Loop reading blocks until EOF or error. */ + for (;;) { - DIRENTRY *dp = readdir (d); - int len; + errno = 0; + dp = readdir (d); + +#ifdef EAGAIN + if (dp == NULL && errno == EAGAIN) + continue; +#endif + + if (dp == NULL) + break; - if (!dp) break; - len = NAMLEN (dp); if (DIRENTRY_NONEMPTY (dp)) { + int len; + int wanted = 0; + Lisp_Object name, finalname; + struct gcpro gcpro1, gcpro2; + + len = NAMLEN (dp); + name = finalname = make_unibyte_string (dp->d_name, len); + GCPRO2 (finalname, name); + + /* Note: ENCODE_FILE can GC; it should protect its argument, + though. */ + name = DECODE_FILE (name); + len = SBYTES (name); + + /* Now that we have unwind_protect in place, we might as well + allow matching to be interrupted. */ + immediate_quit = 1; + QUIT; + if (NILP (match) - || (0 <= re_search (bufp, dp->d_name, len, 0, len, 0))) + || (0 <= re_search (bufp, SDATA (name), len, 0, len, 0))) + wanted = 1; + + immediate_quit = 0; + + if (wanted) { if (!NILP (full)) { - int afterdirindex = dirnamelen; - int total = len + dirnamelen; - int needsep = 0; + Lisp_Object fullname; + int nbytes = len + directory_nbytes + needsep; + int nchars; - /* Decide whether we need to add a directory separator. */ -#ifndef VMS - if (dirnamelen == 0 - || !IS_ANY_SEP (XSTRING (directory)->data[dirnamelen - 1])) - needsep = 1; -#endif /* VMS */ + fullname = make_uninit_multibyte_string (nbytes, nbytes); + bcopy (SDATA (directory), SDATA (fullname), + directory_nbytes); - name = make_uninit_string (total + needsep); - bcopy (XSTRING (directory)->data, XSTRING (name)->data, - dirnamelen); if (needsep) - XSTRING (name)->data[afterdirindex++] = DIRECTORY_SEP; - bcopy (dp->d_name, - XSTRING (name)->data + afterdirindex, len); + SSET (fullname, directory_nbytes, DIRECTORY_SEP); + + bcopy (SDATA (name), + SDATA (fullname) + directory_nbytes + needsep, + len); + + nchars = chars_in_text (SDATA (fullname), nbytes); + + /* Some bug somewhere. */ + if (nchars > nbytes) + abort (); + + STRING_SET_CHARS (fullname, nchars); + if (nchars == nbytes) + STRING_SET_UNIBYTE (fullname); + + finalname = fullname; } else - name = make_string (dp->d_name, len); - list = Fcons (name, list); + finalname = name; + + if (attrs) + { + /* Construct an expanded filename for the directory entry. + Use the decoded names for input to Ffile_attributes. */ + Lisp_Object decoded_fullname, fileattrs; + struct gcpro gcpro1, gcpro2; + + decoded_fullname = fileattrs = Qnil; + GCPRO2 (decoded_fullname, fileattrs); + + /* Both Fexpand_file_name and Ffile_attributes can GC. */ + decoded_fullname = Fexpand_file_name (name, directory); + fileattrs = Ffile_attributes (decoded_fullname, id_format); + + list = Fcons (Fcons (finalname, fileattrs), list); + UNGCPRO; + } + else + list = Fcons (finalname, list); } + + UNGCPRO; } } + + retry_p = 0; +#ifdef EINTR + retry_p |= errno == EINTR; +#endif + closedir (d); - if (!NILP (nosort)) - return list; - return Fsort (Fnreverse (list), Qstring_lessp); + + /* Discard the unwind protect. */ + specpdl_ptr = specpdl + count; + + if (retry_p) + { + list = Qnil; + goto retry; + } + + if (NILP (nosort)) + list = Fsort (Fnreverse (list), + attrs ? Qfile_attributes_lessp : Qstring_lessp); + + RETURN_UNGCPRO (list); +} + + +DEFUN ("directory-files", Fdirectory_files, Sdirectory_files, 1, 4, 0, + doc: /* Return a list of names of files in DIRECTORY. +There are three optional arguments: +If FULL is non-nil, return absolute file names. Otherwise return names + that are relative to the specified directory. +If MATCH is non-nil, mention only file names that match the regexp MATCH. +If NOSORT is non-nil, the list is not sorted--its order is unpredictable. + NOSORT is useful if you plan to sort the result yourself. */) + (directory, full, match, nosort) + Lisp_Object directory, full, match, nosort; +{ + Lisp_Object handler; + directory = Fexpand_file_name (directory, Qnil); + + /* If the file name has special constructs in it, + call the corresponding file handler. */ + handler = Ffind_file_name_handler (directory, Qdirectory_files); + if (!NILP (handler)) + return call5 (handler, Qdirectory_files, directory, + full, match, nosort); + + return directory_files_internal (directory, full, match, nosort, 0, Qnil); } + +DEFUN ("directory-files-and-attributes", Fdirectory_files_and_attributes, + Sdirectory_files_and_attributes, 1, 5, 0, + doc: /* Return a list of names of files and their attributes in DIRECTORY. +There are four optional arguments: +If FULL is non-nil, return absolute file names. Otherwise return names + that are relative to the specified directory. +If MATCH is non-nil, mention only file names that match the regexp MATCH. +If NOSORT is non-nil, the list is not sorted--its order is unpredictable. + NOSORT is useful if you plan to sort the result yourself. +ID-FORMAT specifies the preferred format of attributes uid and gid, see +`file-attributes' for further documentation. */) + (directory, full, match, nosort, id_format) + Lisp_Object directory, full, match, nosort, id_format; +{ + Lisp_Object handler; + directory = Fexpand_file_name (directory, Qnil); + + /* If the file name has special constructs in it, + call the corresponding file handler. */ + handler = Ffind_file_name_handler (directory, Qdirectory_files_and_attributes); + if (!NILP (handler)) + return call6 (handler, Qdirectory_files_and_attributes, + directory, full, match, nosort, id_format); + + return directory_files_internal (directory, full, match, nosort, 1, id_format); +} + Lisp_Object file_name_completion (); DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, - 2, 2, 0, - "Complete file name FILE in directory DIRECTORY.\n\ -Returns the longest string\n\ -common to all file names in DIRECTORY that start with FILE.\n\ -If there is only one and FILE matches it exactly, returns t.\n\ -Returns nil if DIR contains no name starting with FILE.") - (file, directory) + 2, 2, 0, + doc: /* Complete file name FILE in directory DIRECTORY. +Returns the longest string +common to all file names in DIRECTORY that start with FILE. +If there is only one and FILE matches it exactly, returns t. +Returns nil if DIR contains no name starting with FILE. + +This function ignores some of the possible completions as +determined by the variable `completion-ignored-extensions', which see. */) + (file, directory) Lisp_Object file, directory; { Lisp_Object handler; @@ -254,10 +426,10 @@ Returns nil if DIR contains no name starting with FILE.") } DEFUN ("file-name-all-completions", Ffile_name_all_completions, - Sfile_name_all_completions, 2, 2, 0, - "Return a list of all completions of file name FILE in directory DIRECTORY.\n\ -These are all file names in directory DIRECTORY which begin with FILE.") - (file, directory) + Sfile_name_all_completions, 2, 2, 0, + doc: /* Return a list of all completions of file name FILE in directory DIRECTORY. +These are all file names in directory DIRECTORY which begin with FILE. */) + (file, directory) Lisp_Object file, directory; { Lisp_Object handler; @@ -277,23 +449,28 @@ These are all file names in directory DIRECTORY which begin with FILE.") return file_name_completion (file, directory, 1, 0); } +static int file_name_completion_stat (); + Lisp_Object file_name_completion (file, dirname, all_flag, ver_flag) Lisp_Object file, dirname; int all_flag, ver_flag; { DIR *d; - DIRENTRY *dp; - int bestmatchsize, skip; + int bestmatchsize = 0, skip; register int compare, matchsize; unsigned char *p1, *p2; int matchcount = 0; Lisp_Object bestmatch, tem, elt, name; + Lisp_Object encoded_file; + Lisp_Object encoded_dir; struct stat st; int directoryp; int passcount; - int count = specpdl_ptr - specpdl; - struct gcpro gcpro1, gcpro2, gcpro3; + int count = SPECPDL_INDEX (); + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; + + elt = Qnil; #ifdef VMS extern DIRENTRY * readdirver (); @@ -308,16 +485,24 @@ file_name_completion (file, dirname, all_flag, ver_flag) readfunc = readdirver; file = Fupcase (file); #else /* not VMS */ - CHECK_STRING (file, 0); + CHECK_STRING (file); #endif /* not VMS */ #ifdef FILE_SYSTEM_CASE file = FILE_SYSTEM_CASE (file); #endif bestmatch = Qnil; - GCPRO3 (file, dirname, bestmatch); + encoded_file = encoded_dir = Qnil; + GCPRO5 (file, dirname, bestmatch, encoded_file, encoded_dir); dirname = Fexpand_file_name (dirname, Qnil); + /* Do completion on the encoded file name + because the other names in the directory are (we presume) + encoded likewise. We decode the completed string at the end. */ + encoded_file = ENCODE_FILE (file); + + encoded_dir = ENCODE_FILE (dirname); + /* With passcount = 0, ignore files that end in an ignored extension. If nothing found then try again with passcount = 1, don't ignore them. If looking for all completions, start with passcount = 1, @@ -328,9 +513,16 @@ file_name_completion (file, dirname, all_flag, ver_flag) for (passcount = !!all_flag; NILP (bestmatch) && passcount < 2; passcount++) { - if (!(d = opendir (XSTRING (Fdirectory_file_name (dirname))->data))) + int inner_count = SPECPDL_INDEX (); + + d = opendir (SDATA (Fdirectory_file_name (encoded_dir))); + if (!d) report_file_error ("Opening directory", Fcons (dirname, Qnil)); + record_unwind_protect (directory_files_internal_unwind, + Fcons (make_number (((unsigned long) d) >> 16), + make_number (((unsigned long) d) & 0xffff))); + /* Loop reading blocks */ /* (att3b compiler bug requires do a null comparison this way) */ while (1) @@ -347,15 +539,14 @@ file_name_completion (file, dirname, all_flag, ver_flag) len = NAMLEN (dp); - if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) - goto quit; + QUIT; if (! DIRENTRY_NONEMPTY (dp) - || len < XSTRING (file)->size - || 0 <= scmp (dp->d_name, XSTRING (file)->data, - XSTRING (file)->size)) + || len < SCHARS (encoded_file) + || 0 <= scmp (dp->d_name, SDATA (encoded_file), + SCHARS (encoded_file))) continue; - if (file_name_completion_stat (dirname, dp, &st) < 0) + if (file_name_completion_stat (encoded_dir, dp, &st) < 0) continue; directoryp = ((st.st_mode & S_IFMT) == S_IFDIR); @@ -369,24 +560,55 @@ file_name_completion (file, dirname, all_flag, ver_flag) actually in the way in a directory contains only one file. */ if (!passcount && TRIVIAL_DIRECTORY_ENTRY (dp->d_name)) continue; + if (!passcount && len > SCHARS (encoded_file)) + /* Ignore directories if they match an element of + completion-ignored-extensions which ends in a slash. */ + for (tem = Vcompletion_ignored_extensions; + CONSP (tem); tem = XCDR (tem)) + { + int elt_len; + + elt = XCAR (tem); + if (!STRINGP (elt)) + continue; + /* Need to encode ELT, since scmp compares unibyte + strings only. */ + elt = ENCODE_FILE (elt); + elt_len = SCHARS (elt) - 1; /* -1 for trailing / */ + if (elt_len <= 0) + continue; + p1 = SDATA (elt); + if (p1[elt_len] != '/') + continue; + skip = len - elt_len; + if (skip < 0) + continue; + + if (0 <= scmp (dp->d_name + skip, p1, elt_len)) + continue; + break; + } } else { /* Compare extensions-to-be-ignored against end of this file name */ /* if name is not an exact match against specified string */ - if (!passcount && len > XSTRING (file)->size) + if (!passcount && len > SCHARS (encoded_file)) /* and exit this for loop if a match is found */ for (tem = Vcompletion_ignored_extensions; - CONSP (tem); tem = XCONS (tem)->cdr) + CONSP (tem); tem = XCDR (tem)) { - elt = XCONS (tem)->car; + elt = XCAR (tem); if (!STRINGP (elt)) continue; - skip = len - XSTRING (elt)->size; + /* Need to encode ELT, since scmp compares unibyte + strings only. */ + elt = ENCODE_FILE (elt); + skip = len - SCHARS (elt); if (skip < 0) continue; if (0 <= scmp (dp->d_name + skip, - XSTRING (elt)->data, - XSTRING (elt)->size)) + SDATA (elt), + SCHARS (elt))) continue; break; } @@ -405,9 +627,10 @@ file_name_completion (file, dirname, all_flag, ver_flag) /* Ignore this element if it fails to match all the regexps. */ for (regexps = Vcompletion_regexp_list; CONSP (regexps); - regexps = XCONS (regexps)->cdr) + regexps = XCDR (regexps)) { - tem = Fstring_match (XCONS (regexps)->car, elt, zero); + tem = Fstring_match (XCAR (regexps), + make_string (dp->d_name, len), zero); if (NILP (tem)) break; } @@ -431,18 +654,19 @@ file_name_completion (file, dirname, all_flag, ver_flag) name = make_string (dp->d_name, len); if (all_flag) { + name = DECODE_FILE (name); bestmatch = Fcons (name, bestmatch); } else { bestmatch = name; - bestmatchsize = XSTRING (name)->size; + bestmatchsize = SCHARS (name); } } else { compare = min (bestmatchsize, len); - p1 = XSTRING (bestmatch)->data; + p1 = SDATA (bestmatch); p2 = (unsigned char *) dp->d_name; matchsize = scmp(p1, p2, compare); if (matchsize < 0) @@ -456,8 +680,8 @@ file_name_completion (file, dirname, all_flag, ver_flag) /* This tests that the current file is an exact match but BESTMATCH is not (it is too long). */ if ((matchsize == len - && matchsize + !!directoryp - < XSTRING (bestmatch)->size) + && matchsize + !!directoryp + < SCHARS (bestmatch)) || /* If there is no exact match ignoring case, prefer a match that does not change the case @@ -469,10 +693,10 @@ file_name_completion (file, dirname, all_flag, ver_flag) either both or neither are exact. */ (((matchsize == len) == - (matchsize + !!directoryp - == XSTRING (bestmatch)->size)) - && !bcmp (p2, XSTRING (file)->data, XSTRING (file)->size) - && bcmp (p1, XSTRING (file)->data, XSTRING (file)->size))) + (matchsize + !!directoryp + == SCHARS (bestmatch))) + && !bcmp (p2, SDATA (encoded_file), SCHARS (encoded_file)) + && bcmp (p1, SDATA (encoded_file), SCHARS (encoded_file)))) { bestmatch = make_string (dp->d_name, len); if (directoryp) @@ -490,30 +714,65 @@ file_name_completion (file, dirname, all_flag, ver_flag) bestmatchsize = matchsize; } } - closedir (d); + /* This closes the directory. */ + bestmatch = unbind_to (inner_count, bestmatch); } UNGCPRO; bestmatch = unbind_to (count, bestmatch); if (all_flag || NILP (bestmatch)) - return bestmatch; - if (matchcount == 1 && bestmatchsize == XSTRING (file)->size) + { + if (STRINGP (bestmatch)) + bestmatch = DECODE_FILE (bestmatch); + return bestmatch; + } + if (matchcount == 1 && bestmatchsize == SCHARS (file)) return Qt; - return Fsubstring (bestmatch, make_number (0), make_number (bestmatchsize)); - quit: - if (d) closedir (d); - Vquit_flag = Qnil; - return Fsignal (Qquit, Qnil); + bestmatch = Fsubstring (bestmatch, make_number (0), + make_number (bestmatchsize)); + /* Now that we got the right initial segment of BESTMATCH, + decode it from the coding system in use. */ + bestmatch = DECODE_FILE (bestmatch); + return bestmatch; } +/* Compare exactly LEN chars of strings at S1 and S2, + ignoring case if appropriate. + Return -1 if strings match, + else number of chars that match at the beginning. */ + +static int +scmp (s1, s2, len) + register unsigned char *s1, *s2; + int len; +{ + register int l = len; + + if (completion_ignore_case) + { + while (l && DOWNCASE (*s1++) == DOWNCASE (*s2++)) + l--; + } + else + { + while (l && *s1++ == *s2++) + l--; + } + if (l == 0) + return -1; + else + return len - l; +} + +static int file_name_completion_stat (dirname, dp, st_addr) Lisp_Object dirname; DIRENTRY *dp; struct stat *st_addr; { int len = NAMLEN (dp); - int pos = XSTRING (dirname)->size; + int pos = SCHARS (dirname); int value; char *fullname = (char *) alloca (len + pos + 2); @@ -530,7 +789,7 @@ file_name_completion_stat (dirname, dp, st_addr) #endif /* __DJGPP__ > 1 */ #endif /* MSDOS */ - bcopy (XSTRING (dirname)->data, fullname, pos); + bcopy (SDATA (dirname), fullname, pos); #ifndef VMS if (!IS_DIRECTORY_SEP (fullname[pos - 1])) fullname[pos++] = DIRECTORY_SEP; @@ -560,18 +819,18 @@ file_name_completion_stat (dirname, dp, st_addr) #ifdef VMS DEFUN ("file-name-all-versions", Ffile_name_all_versions, - Sfile_name_all_versions, 2, 2, 0, - "Return a list of all versions of file name FILE in directory DIRECTORY.") - (file, directory) + Sfile_name_all_versions, 2, 2, 0, + doc: /* Return a list of all versions of file name FILE in directory DIRECTORY. */) + (file, directory) Lisp_Object file, directory; { return file_name_completion (file, directory, 1, 1); } DEFUN ("file-version-limit", Ffile_version_limit, Sfile_version_limit, 1, 1, 0, - "Return the maximum number of versions allowed for FILE.\n\ -Returns nil if the file cannot be opened or if there is no version limit.") - (filename) + doc: /* Return the maximum number of versions allowed for FILE. +Returns nil if the file cannot be opened or if there is no version limit. */) + (filename) Lisp_Object filename; { Lisp_Object retval; @@ -583,7 +842,7 @@ Returns nil if the file cannot be opened or if there is no version limit.") filename = Fexpand_file_name (filename, Qnil); fab = cc$rms_fab; xabfhc = cc$rms_xabfhc; - fab.fab$l_fna = XSTRING (filename)->data; + fab.fab$l_fna = SDATA (filename); fab.fab$b_fns = strlen (fab.fab$l_fna); fab.fab$l_xab = (char *) &xabfhc; status = sys$open (&fab, 0, 0); @@ -600,38 +859,52 @@ Returns nil if the file cannot be opened or if there is no version limit.") Lisp_Object make_time (time) - int time; + time_t time; { return Fcons (make_number (time >> 16), Fcons (make_number (time & 0177777), Qnil)); } -DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 1, 0, - "Return a list of attributes of file FILENAME.\n\ -Value is nil if specified file cannot be opened.\n\ -Otherwise, list elements are:\n\ - 0. t for directory, string (name linked to) for symbolic link, or nil.\n\ - 1. Number of links to file.\n\ - 2. File uid.\n\ - 3. File gid.\n\ - 4. Last access time, as a list of two integers.\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 (-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\ -11. Device number.\n\ -\n\ -If file does not exist, returns nil.") - (filename) - Lisp_Object filename; +DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 2, 0, + doc: /* Return a list of attributes of file FILENAME. +Value is nil if specified file cannot be opened. + +ID-FORMAT specifies the preferred format of attributes uid and gid (see +below) - valid values are 'string and 'integer. The latter is the 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. + +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. + 2. File uid as a string or an integer. If a string value cannot be + looked up, the integer value is returned. + 3. File gid, likewise. + 4. Last access time, as a list of two integers. + First integer has high-order 16 bits of time, second has low 16 bits. + 5. Last modification time, likewise. + 6. Last status change time, likewise. + 7. Size in bytes. + This is a floating point number if the size is too large for an integer. + 8. File modes, as a string of ten letters or dashes as in ls -l. + 9. t iff file's gid would change if file were deleted and recreated. +10. inode number. If inode number is larger than the Emacs integer, + this is a cons cell containing two integers: first the high part, + then the low 16 bits. +11. Device number. If it is larger than the Emacs integer, this is + a cons cell, similar to the inode number. */) + (filename, id_format) + Lisp_Object filename, id_format; { Lisp_Object values[12]; - Lisp_Object dirname; + Lisp_Object encoded; struct stat s; + struct passwd *pw; + struct group *gr; +#if defined (BSD4_2) || defined (BSD4_3) + Lisp_Object dirname; struct stat sdir; +#endif char modes[10]; Lisp_Object handler; @@ -641,9 +914,17 @@ If file does not exist, returns nil.") call the corresponding file handler. */ handler = Ffind_file_name_handler (filename, Qfile_attributes); if (!NILP (handler)) - return call2 (handler, Qfile_attributes, filename); + { /* Only pass the extra arg if it is used to help backward compatibility + with old file handlers which do not implement the new arg. --Stef */ + if (NILP (id_format)) + return call2 (handler, Qfile_attributes, filename); + else + return call3 (handler, Qfile_attributes, filename, id_format); + } + + encoded = ENCODE_FILE (filename); - if (lstat (XSTRING (filename)->data, &s) < 0) + if (lstat (SDATA (encoded), &s) < 0) return Qnil; switch (s.st_mode & S_IFMT) @@ -658,50 +939,90 @@ If file does not exist, returns nil.") #endif } values[1] = make_number (s.st_nlink); - values[2] = make_number (s.st_uid); - values[3] = make_number (s.st_gid); + if (NILP (id_format) || EQ (id_format, Qinteger)) + { + values[2] = make_number (s.st_uid); + values[3] = make_number (s.st_gid); + } + else + { + pw = (struct passwd *) getpwuid (s.st_uid); + values[2] = (pw ? build_string (pw->pw_name) : make_number (s.st_uid)); + gr = (struct group *) getgrgid (s.st_gid); + values[3] = (gr ? build_string (gr->gr_name) : make_number (s.st_gid)); + } values[4] = make_time (s.st_atime); values[5] = make_time (s.st_mtime); values[6] = make_time (s.st_ctime); - values[7] = make_number ((int) s.st_size); - /* If the size is out of range, give back -1. */ + values[7] = make_number (s.st_size); + /* If the size is out of range for an integer, return a float. */ if (XINT (values[7]) != s.st_size) - XSETINT (values[7], -1); + values[7] = make_float ((double)s.st_size); + /* If the size is negative, and its type is long, convert it back to + positive. */ + if (s.st_size < 0 && sizeof (s.st_size) == sizeof (long)) + values[7] = make_float ((double) ((unsigned long) s.st_size)); + 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 compatibility' */ -#endif -#ifdef BSD4_2 /* file gid will be dir gid */ +#if defined (BSD4_2) || defined (BSD4_3) /* file gid will be dir gid */ dirname = Ffile_name_directory (filename); - if (! NILP (dirname) && stat (XSTRING (dirname)->data, &sdir) == 0) + if (! NILP (dirname)) + encoded = ENCODE_FILE (dirname); + if (! NILP (dirname) && stat (SDATA (encoded), &sdir) == 0) values[9] = (sdir.st_gid != s.st_gid) ? Qt : Qnil; else /* if we can't tell, assume worst */ values[9] = Qt; #else /* file gid will be egid */ values[9] = (s.st_gid != getegid ()) ? Qt : Qnil; #endif /* BSD4_2 (or BSD4_3) */ -#ifdef BSD4_3 -#undef BSD4_2 /* ok, you can look again without throwing up */ -#endif - values[10] = make_number (s.st_ino); - values[11] = make_number (s.st_dev); + if (FIXNUM_OVERFLOW_P (s.st_ino)) + /* To allow inode numbers larger than VALBITS, separate the bottom + 16 bits. */ + values[10] = Fcons (make_number (s.st_ino >> 16), + make_number (s.st_ino & 0xffff)); + else + /* But keep the most common cases as integers. */ + values[10] = make_number (s.st_ino); + + /* Likewise for device. */ + if (FIXNUM_OVERFLOW_P (s.st_dev)) + values[11] = Fcons (make_number (s.st_dev >> 16), + make_number (s.st_dev & 0xffff)); + else + values[11] = make_number (s.st_dev); + return Flist (sizeof(values) / sizeof(values[0]), values); } + +DEFUN ("file-attributes-lessp", Ffile_attributes_lessp, Sfile_attributes_lessp, 2, 2, 0, + doc: /* Return t if first arg file attributes list is less than second. +Comparison is in lexicographic order and case is significant. */) + (f1, f2) + Lisp_Object f1, f2; +{ + return Fstring_lessp (Fcar (f1), Fcar (f2)); +} +void syms_of_dired () { Qdirectory_files = intern ("directory-files"); + Qdirectory_files_and_attributes = intern ("directory-files-and-attributes"); Qfile_name_completion = intern ("file-name-completion"); Qfile_name_all_completions = intern ("file-name-all-completions"); Qfile_attributes = intern ("file-attributes"); + Qfile_attributes_lessp = intern ("file-attributes-lessp"); staticpro (&Qdirectory_files); + staticpro (&Qdirectory_files_and_attributes); staticpro (&Qfile_name_completion); staticpro (&Qfile_name_all_completions); staticpro (&Qfile_attributes); + staticpro (&Qfile_attributes_lessp); defsubr (&Sdirectory_files); + defsubr (&Sdirectory_files_and_attributes); defsubr (&Sfile_name_completion); #ifdef VMS defsubr (&Sfile_name_all_versions); @@ -709,6 +1030,7 @@ syms_of_dired () #endif /* VMS */ defsubr (&Sfile_name_all_completions); defsubr (&Sfile_attributes); + defsubr (&Sfile_attributes_lessp); #ifdef VMS Qcompletion_ignore_case = intern ("completion-ignore-case"); @@ -716,8 +1038,13 @@ syms_of_dired () #endif /* VMS */ DEFVAR_LISP ("completion-ignored-extensions", &Vcompletion_ignored_extensions, - "*Completion ignores filenames ending in any string in this list.\n\ -This variable does not affect lists of possible completions,\n\ -but does affect the commands that actually do completions."); + doc: /* *Completion ignores filenames ending in any string in this list. +Directories are ignored if they match any string in this list which +ends in a slash. +This variable does not affect lists of possible completions, +but does affect the commands that actually do completions. */); Vcompletion_ignored_extensions = Qnil; } + +/* arch-tag: 1ac8deca-4d8f-4d41-ade9-089154d98c03 + (do not change this comment) */