xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	966663fcf606
children	ca9a9ec9c1c1

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 /* Synched up with: Mule 2.0, FSF 19.30. */
 /* More syncing: FSF Emacs 19.34.6 by Marc Paquette <marcpa@cam.org> */
 #include <config.h>
 #include "lisp.h"
+#include <limits.h>
 #include "buffer.h"
 #include "events.h"
 #include "frame.h"
 #include "insdel.h"
 filenames will sometimes compare inequal, because
 `expand-file-name' doesn't always down-case the drive letter.  */
 #define DRIVE_LETTER(x) (tolower (x))
 #endif /* WINDOWSNT */
+int lisp_to_time (Lisp_Object, time_t *);
+Lisp_Object time_to_lisp (time_t);
 /* Nonzero during writing of auto-save files */
 static int auto_saving;
 /* Set by auto_save_1 to mode of original file so Fwrite_region_internal
 will create a new file with the same mode as the original */
 as losing as I thought.  See sys_do_signal() in sysdep.c.)
 Solaris include files declare the return value as ssize_t.
 Is that standard? */
 int
-read_allowing_quit (int fildes, void *buf, unsigned int nbyte)
+read_allowing_quit (int fildes, void *buf, size_t size)
 {
-int nread;
 QUIT;
+return sys_read_1 (fildes, buf, size, 1);
-nread = sys_read_1 (fildes, buf, nbyte, 1);
-return nread;
 }
 int
-write_allowing_quit (int fildes, CONST void *buf, unsigned int nbyte)
+write_allowing_quit (int fildes, CONST void *buf, size_t size)
 {
-int nread;
 QUIT;
-nread = sys_write_1 (fildes, buf, nbyte, 1);
+return sys_write_1 (fildes, buf, size, 1);
-return nread;
 }
 Lisp_Object Qexpand_file_name;
 Lisp_Object Qfile_truename;
 DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory, 1, 1, 0, /*
 Return a directly usable directory name somehow associated with FILENAME.
 A `directly usable' directory name is one that may be used without the
 intervention of any file handler.
 If FILENAME is a directly usable file itself, return
-(file-name-directory FILENAME).
+\(file-name-directory FILENAME).
 The `call-process' and `start-process' functions use this function to
 get a current directory to run processes in.
 */
 (filename))
 {
 	    }
 	  return name;
 #else /* not WINDOWSNT */
 	  if (nm == XSTRING_DATA (name))
 	    return name;
-	  return build_string (nm);
+	  return build_string ((char *) nm);
 #endif /* not WINDOWSNT */
 	}
 }
 /* At this point, nm might or might not be an absolute file name.  We
 if (newdir)
 {
 /* Get rid of any slash at the end of newdir, unless newdir is
 	 just // (an incomplete UNC name).  */
-length = strlen (newdir);
+length = strlen ((char *) newdir);
 if (length > 0 && IS_DIRECTORY_SEP (newdir[length - 1])
 #ifdef WINDOWSNT
 	  && !(length == 2 && IS_DIRECTORY_SEP (newdir[0]))
 #endif
 	  )
 }
 else
 tlen = 0;
 /* Now concatenate the directory and name to new space in the stack frame */
-tlen += strlen (nm) + 1;
+tlen += strlen ((char *) nm) + 1;
 #ifdef WINDOWSNT
 /* Add reserved space for drive name.  (The Microsoft x86 compiler
 produces incorrect code if the following two lines are combined.)  */
 target = (Bufbyte *) alloca (tlen + 2);
 target += 2;
 *target = 0;
 if (newdir)
 {
 if (nm[0] == 0 || IS_DIRECTORY_SEP (nm[0]))
-	strcpy (target, newdir);
+	strcpy ((char *) target, (char *) newdir);
 else
-	file_name_as_directory (target, newdir);
+	file_name_as_directory ((char *) target, (char *) newdir);
 }
-strcat (target, nm);
+strcat ((char *) target, (char *) nm);
 /* ASSERT (IS_DIRECTORY_SEP (target[0])) if not VMS */
 /* Now canonicalize by removing /. and /foo/.. if they appear.  */
 handler = Ffind_file_name_handler (dirname_, Qmake_directory_internal);
 UNGCPRO;
 if (!NILP (handler))
 return (call2 (handler, Qmake_directory_internal, dirname_));
-if (XSTRING_LENGTH (dirname_) > (sizeof (dir) - 1))
+if (XSTRING_LENGTH (dirname_) > (Bytecount) (sizeof (dir) - 1))
 {
 return Fsignal (Qfile_error,
 		      list3 (build_translated_string ("Creating directory"),
 			     build_translated_string ("pathame too long"),
 			     dirname_));
 /* This function does not GC */
 Bufbyte *ptr;
 CHECK_STRING (filename);
 ptr = XSTRING_DATA (filename);
-if (IS_DIRECTORY_SEP (*ptr) || *ptr == '~'
+return (IS_DIRECTORY_SEP (*ptr) || *ptr == '~'
 #ifdef WINDOWSNT
-|| (IS_DRIVE (*ptr) && ptr[1] == ':' && IS_DIRECTORY_SEP (ptr[2]))
+	  || (IS_DRIVE (*ptr) && ptr[1] == ':' && IS_DIRECTORY_SEP (ptr[2]))
 #endif
-)
+	  ) ? Qt : Qnil;
-return Qt;
-else
-return Qnil;
 }
 /* Return nonzero if file FILENAME exists and can be executed.  */
 static int
 handler = Ffind_file_name_handler (abspath, Qfile_exists_p);
 UNGCPRO;
 if (!NILP (handler))
 return call2 (handler, Qfile_exists_p, abspath);
-if (stat ((char *) XSTRING_DATA (abspath), &statbuf) >= 0)
+return stat ((char *) XSTRING_DATA (abspath), &statbuf) >= 0 ? Qt : Qnil;
-return (Qt);
-else
-return (Qnil);
 }
 DEFUN ("file-executable-p", Ffile_executable_p, 1, 1, 0, /*
 Return t if FILENAME can be executed by you.
 For a directory, this means you can access files in that directory.
 handler = Ffind_file_name_handler (abspath, Qfile_executable_p);
 UNGCPRO;
 if (!NILP (handler))
 return call2 (handler, Qfile_executable_p, abspath);
-return (check_executable ((char *) XSTRING_DATA (abspath))
+return check_executable ((char *) XSTRING_DATA (abspath)) ? Qt : Qnil;
-	  ? Qt : Qnil);
 }
 DEFUN ("file-readable-p", Ffile_readable_p, 1, 1, 0, /*
 Return t if file FILENAME exists and you can read it.
 See also `file-exists-p' and `file-attributes'.
 	  curpos = st.st_size - (BUF_ZV (buf) - same_at_end);
 	  /* If the entire file matches the buffer tail, stop the scan.  */
 	  if (curpos == 0)
 	    break;
 	  /* How much can we scan in the next step?  */
-	  trial = min (curpos, sizeof buffer);
+	  trial = min (curpos, (Bufpos) sizeof (buffer));
 	  if (lseek (fd, curpos - trial, 0) < 0)
 	    report_file_error ("Setting file position", list1 (filename));
 	  total_read = 0;
 	  while (total_read < trial)
 	  if (!NILP (Ffboundp (Qcompute_buffer_file_truename)))
 	    call1 (Qcompute_buffer_file_truename, make_buffer (buf));
 	}
 BUF_SAVE_MODIFF (buf) = BUF_MODIFF (buf);
 buf->auto_save_modified = BUF_MODIFF (buf);
-buf->save_length = make_int (BUF_SIZE (buf));
+buf->saved_size = make_int (BUF_SIZE (buf));
 #ifdef CLASH_DETECTION
 if (NILP (handler))
 	{
 	  if (!NILP (buf->file_truename))
 	    unlock_file (buf->file_truename);
 Lisp_Object val = call8 (handler, Qwrite_region, start, end,
 filename, append, visit, lockname, codesys);
 	if (visiting)
 	  {
 	    BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
-	    current_buffer->save_length =
+	    current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
-	      make_int (BUF_SIZE (current_buffer));
 	    current_buffer->filename = visit_file;
 	    MARK_MODELINE_CHANGED;
 	  }
 	return val;
 }
 strerror (save_errno));
 if (visiting)
 {
 BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
-current_buffer->save_length = make_int (BUF_SIZE (current_buffer));
+current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
 current_buffer->filename = visit_file;
 MARK_MODELINE_CHANGED;
 }
 else if (quietly)
 {
 int nextpos;
 unsigned char largebuf[A_WRITE_BATCH_SIZE];
 Lstream *instr = XLSTREAM (instream);
 Lstream *outstr = XLSTREAM (outstream);
-while (NILP (*annot) || CONSP (*annot))
+while (LISTP (*annot))
 {
 tem = Fcar_safe (Fcar (*annot));
 if (INTP (tem))
 	nextpos = XINT (tem);
 else
 DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime, 0, 1, 0, /*
 Update buffer's recorded modification time from the visited file's time.
 Useful if the buffer was not read from the file normally
 or if the file itself has been changed for some known benign reason.
 An argument specifies the modification time value to use
-(instead of that of the visited file), in the form of a list
+\(instead of that of the visited file), in the form of a list
-(HIGH . LOW) or (HIGH LOW).
+\(HIGH . LOW) or (HIGH LOW).
 */
 (time_list))
 {
 /* This function can call lisp */
 if (!NILP (time_list))
 	     and file changed since last real save.  */
 	  if (GC_STRINGP (b->auto_save_file_name)
 	      && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)
 	      && b->auto_save_modified < BUF_MODIFF (b)
 	      /* -1 means we've turned off autosaving for a while--see below.  */
-	      && XINT (b->save_length) >= 0
+	      && XINT (b->saved_size) >= 0
 	      && (do_handled_files
 		  || NILP (Ffind_file_name_handler (b->auto_save_file_name,
 						    Qwrite_region))))
 	    {
 	      EMACS_TIME before_time, after_time;
 		  && (EMACS_SECS (before_time) - b->auto_save_failure_time <
 		      1200))
 		continue;
 	      if (!preparing_for_armageddon &&
-		  (XINT (b->save_length) * 10
+		  (XINT (b->saved_size) * 10
 		   > (BUF_Z (b) - BUF_BEG (b)) * 13)
 		  /* A short file is likely to change a large fraction;
 		     spare the user annoying messages.  */
-		  && XINT (b->save_length) > 5000
+		  && XINT (b->saved_size) > 5000
 		  /* These messages are frequent and annoying for `*mail*'.  */
-		  && !EQ (b->filename, Qnil)
+		  && !NILP (b->filename)
 		  && NILP (no_message)
 		  && disable_auto_save_when_buffer_shrinks)
 		{
 		  /* It has shrunk too much; turn off auto-saving here.
 		     Unless we're about to crash, in which case auto-save it
 		  message
 		    ("Buffer %s has shrunk a lot; auto save turned off there",
 		     XSTRING_DATA (b->name));
 		  /* Turn off auto-saving until there's a real save,
 		     and prevent any more warnings.  */
-		  b->save_length = make_int (-1);
+		  b->saved_size = make_int (-1);
 		  if (!gc_in_progress)
 		    Fsleep_for (make_int (1));
 		  continue;
 		}
 	      set_buffer_internal (b);
 	      /* Handler killed their own buffer! */
 	      if (!BUFFER_LIVE_P(b))
 		continue;
 	      b->auto_save_modified = BUF_MODIFF (b);
-	      b->save_length = make_int (BUF_SIZE (b));
+	      b->saved_size = make_int (BUF_SIZE (b));
 	      EMACS_GET_TIME (after_time);
 	      /* If auto-save took more than 60 seconds,
 		 assume it was an NFS failure that got a timeout.  */
 	      if (EMACS_SECS (after_time) - EMACS_SECS (before_time) > 60)
 		b->auto_save_failure_time = EMACS_SECS (after_time);
 No auto-save file will be written until the buffer changes again.
 */
 ())
 {
 current_buffer->auto_save_modified = BUF_MODIFF (current_buffer);
-current_buffer->save_length = make_int (BUF_SIZE (current_buffer));
+current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
 current_buffer->auto_save_failure_time = -1;
 return Qnil;
 }
 DEFUN ("clear-buffer-auto-save-failure", Fclear_buffer_auto_save_failure, 0, 0, 0, /*

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 272:c5d627a313b1 r21-0b34