From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Matthew Mundell Newsgroups: gmane.emacs.devel Subject: Re: dired-do-touch Date: 23 Mar 2004 21:48:19 +0000 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <877jxbqlp8.fsf@sno.mundell.ukfsn.org> References: <20040321165848.0DB3C662F8@imf.math.ku.dk> <405DDAF3.2080608@math.ku.dk> <87vfkwbg51.fsf@sno.mundell.ukfsn.org> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1080078743 28436 80.91.224.253 (23 Mar 2004 21:52:23 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 23 Mar 2004 21:52:23 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue Mar 23 22:52:06 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B5toc-0001K3-00 for ; Tue, 23 Mar 2004 22:52:06 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B5tob-0007y0-00 for ; Tue, 23 Mar 2004 22:52:06 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B5toO-0006oO-Ev for emacs-devel@quimby.gnus.org; Tue, 23 Mar 2004 16:51:52 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B5tmZ-0006Bh-Dd for emacs-devel@gnu.org; Tue, 23 Mar 2004 16:49:59 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B5tlh-000581-Hy for emacs-devel@gnu.org; Tue, 23 Mar 2004 16:49:37 -0500 Original-Received: from [217.158.120.143] (helo=mail.ukfsn.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B5tl5-0004bn-Np; Tue, 23 Mar 2004 16:48:27 -0500 Original-Received: from localhost (lucy.ukfsn.org [127.0.0.1]) by mail.ukfsn.org (Postfix) with ESMTP id C200EE6DA4; Tue, 23 Mar 2004 21:47:54 +0000 (GMT) Original-Received: from mail.ukfsn.org ([127.0.0.1]) by localhost (lucy.ukfsn.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 24209-20; Tue, 23 Mar 2004 21:47:54 +0000 (GMT) Original-Received: from sno.mundell.ukfsn.org (dsl213-218-238-16.as15444.net [213.218.238.16]) by mail.ukfsn.org (Postfix) with ESMTP id 5B131E6DA2; Tue, 23 Mar 2004 21:47:54 +0000 (GMT) Original-Received: from sno.mundell.ukfsn.org ([10.0.0.3]) by sno.mundell.ukfsn.org with esmtp (Exim 3.36 #1 (Debian)) id 1B5tky-0000YU-00; Tue, 23 Mar 2004 21:48:20 +0000 Original-To: Eli Zaretskii Original-Lines: 155 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:20820 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20820 > Eli Zaretskii writes: > > > > From: Matthew Mundell > > > Date: 22 Mar 2004 23:45:14 +0000 > > > > > > + if (set_file_times (SDATA (encoded_absname), t, t) < 0) > > > + report_file_error ("Setting file times", Fcons (absname, Qnil)); > > > > I think this will throw an error on Windows if the file is a > > directory. So it would be good to single out that case on DOS_NT > > systems. Does the version below correctly handle the case? > > Otherwise, thanks a lot! Thanks. Here are change logs and the Dired "T" key binding, to go with yesterday's patches. 2004-03-23 Matthew Mundell * dired-aux.el (dired-touch, dired-do-touch): New defuns. * dired.el: Bind dired-do-touch to T. =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/dired.el,v diff -u -r1.273 dired.el --- lisp/dired.el 23 Mar 2004 05:20:11 -0000 1.273 +++ lisp/dired.el 23 Mar 2004 12:17:57 -0000 @@ -909,6 +909,7 @@ (define-key map "Q" 'dired-do-query-replace-regexp) (define-key map "R" 'dired-do-rename) (define-key map "S" 'dired-do-symlink) + (define-key map "T" 'dired-do-touch) (define-key map "X" 'dired-do-shell-command) (define-key map "Z" 'dired-do-compress) (define-key map "!" 'dired-do-shell-command) 2004-03-23 Matthew Mundell * fileio.c (Qset_file_times): New variable. (Fset_file_times): New function. (lisp_time_argument): New declaration. (syms_of_fileio): staticpro and intern new variable, defsubr new function. * editfns.c (lisp_time_argument): Provide externally. =================================================================== RCS file: /cvsroot/emacs/emacs/src/fileio.c,v diff -u -r1.499 fileio.c --- src/fileio.c 18 Mar 2004 02:58:45 -0000 1.499 +++ src/fileio.c 23 Mar 2004 12:56:40 -0000 @@ -323,6 +323,7 @@ Lisp_Object Qfile_accessible_directory_p; Lisp_Object Qfile_modes; Lisp_Object Qset_file_modes; +Lisp_Object Qset_file_times; Lisp_Object Qfile_newer_than_file_p; Lisp_Object Qinsert_file_contents; Lisp_Object Qwrite_region; @@ -3438,7 +3439,66 @@ XSETINT (value, (~ realmask) & 0777); return value; } + +extern int lisp_time_argument P_ ((Lisp_Object, time_t *, int *)); + +DEFUN ("set-file-times", Fset_file_times, Sset_file_times, 1, 2, 0, + doc: /* Set access and modification times of file FILENAME. +If optional second argument TIME is supplied then it is used instead +of the current time. TIME must be in the format of +`current-time'. */) + (filename, time) + Lisp_Object filename, time; +{ + Lisp_Object absname, encoded_absname; + Lisp_Object handler; + time_t sec; + int usec; + + if (! lisp_time_argument (time, &sec, &usec)) + error ("Invalid time specification"); + + absname = Fexpand_file_name (filename, current_buffer->directory); + + /* If the file name has special constructs in it, + call the corresponding file handler. */ + handler = Ffind_file_name_handler (absname, Qset_file_times); + if (!NILP (handler)) + return call3 (handler, Qset_file_times, absname, time); + + encoded_absname = ENCODE_FILE (absname); + + { + EMACS_TIME t; + + EMACS_SET_SECS (t, sec); + EMACS_SET_USECS (t, usec); + +#ifdef WINDOWSNT + { + DWORD attributes; + Lisp_Object filename; + /* Ensure file is writable while its modified time is set. */ + filename = SDATA (encoded_absname); + attributes = GetFileAttributes (filename); + SetFileAttributes (filename, attributes & ~FILE_ATTRIBUTE_READONLY); + if (set_file_times (filename, t, t)) + { + /* Restore original attributes. */ + SetFileAttributes (filename, attributes); + report_file_error ("Setting file times", Fcons (absname, Qnil)); + } + /* Restore original attributes. */ + SetFileAttributes (filename, attributes); + } +#else + if (set_file_times (SDATA (encoded_absname), t, t)) + report_file_error ("Setting file times", Fcons (absname, Qnil)); +#endif + } + return Qnil; +} #ifdef __NetBSD__ #define unix 42 @@ -6339,6 +6399,7 @@ Qfile_accessible_directory_p = intern ("file-accessible-directory-p"); Qfile_modes = intern ("file-modes"); Qset_file_modes = intern ("set-file-modes"); + Qset_file_times = intern ("set-file-times"); Qfile_newer_than_file_p = intern ("file-newer-than-file-p"); Qinsert_file_contents = intern ("insert-file-contents"); Qwrite_region = intern ("write-region"); @@ -6372,6 +6433,7 @@ staticpro (&Qfile_accessible_directory_p); staticpro (&Qfile_modes); staticpro (&Qset_file_modes); + staticpro (&Qset_file_times); staticpro (&Qfile_newer_than_file_p); staticpro (&Qinsert_file_contents); staticpro (&Qwrite_region); @@ -6595,6 +6657,7 @@ defsubr (&Sfile_regular_p); defsubr (&Sfile_modes); defsubr (&Sset_file_modes); + defsubr (&Sset_file_times); defsubr (&Sset_default_file_modes); defsubr (&Sdefault_file_modes); defsubr (&Sfile_newer_than_file_p);