xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 227:0e522484dd2a r20-5b12

Import from CVS: tag r20-5b12

author	cvs
date	Mon, 13 Aug 2007 10:12:37 +0200
parents	12579d965149
children	85a06df23a9a

comparison

equal deleted inserted replaced

-:eea38c7ad7b4
+:0e522484dd2a
 if (EQ (operation, Vinhibit_file_name_operation))
 inhibited_handlers = Vinhibit_file_name_handlers;
 else
 inhibited_handlers = Qnil;
-for (chain = Vfile_name_handler_alist; CONSP (chain);
+EXTERNAL_LIST_LOOP (chain, Vfile_name_handler_alist)
-chain = XCDR (chain))
 {
 Lisp_Object elt = XCAR (chain);
 if (CONSP (elt))
 	{
-	  Lisp_Object string;
+	  Lisp_Object string = XCAR (elt);
-	  string = XCAR (elt);
 	  if (STRINGP (string)
 	      && (fast_lisp_string_match (string, filename) >= 0))
 	    {
 	      Lisp_Object handler = XCDR (elt);
 	      if (NILP (Fmemq (handler, inhibited_handlers)))
 return make_string (target, o - target);
 }
 #if 0 /* FSFmacs */
-another older version of expand-file-name;
+/* another older version of expand-file-name; */
 #endif
 DEFUN ("file-truename", Ffile_truename, 1, 2, 0, /*
 Return the canonical name of the given FILE.
 Second arg DEFAULT is directory to start with if FILE is relative
 else if (stat ((CONST char *) XSTRING_DATA (newname), &out_st) < 0)
 out_st.st_mode = 0;
 ifd = interruptible_open ((char *) XSTRING_DATA (filename), O_RDONLY, 0);
 if (ifd < 0)
-report_file_error ("Opening input file", Fcons (filename, Qnil));
+report_file_error ("Opening input file", list1 (filename));
 record_unwind_protect (close_file_unwind, make_int (ifd));
 /* We can only copy regular files and symbolic links.  Other files are not
 copyable by us. */
 if (out_st.st_mode != 0
 && st.st_dev == out_st.st_dev && st.st_ino == out_st.st_ino)
 {
 errno = 0;
 report_file_error ("Input and output files are the same",
-			 Fcons (filename, Fcons (newname, Qnil)));
+			 list2 (filename, newname));
 }
 #endif
 #if defined (S_ISREG) && defined (S_ISLNK)
 if (input_file_statable_p)
 	{
 #if defined (EISDIR)
 	  /* Get a better looking error message. */
 	  errno = EISDIR;
 #endif /* EISDIR */
-	report_file_error ("Non-regular file", Fcons (filename, Qnil));
+	report_file_error ("Non-regular file", list1 (filename));
 	}
 }
 #endif /* S_ISREG && S_ISLNK */
 #ifdef MSDOS
 	report_file_error ("I/O error", list1 (newname));
 }
 /* Closing the output clobbers the file times on some systems.  */
 if (close (ofd) < 0)
-report_file_error ("I/O error", Fcons (newname, Qnil));
+report_file_error ("I/O error", list1 (newname));
 if (input_file_statable_p)
 {
 if (!NILP (keep_time))
 {
 EMACS_TIME atime, mtime;
 EMACS_SET_SECS_USECS (atime, st.st_atime, 0);
 EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0);
 if (set_file_times ((char *) XSTRING_DATA (newname), atime,
 			    mtime))
-	  report_file_error ("I/O error", Fcons (newname, Qnil));
+	  report_file_error ("I/O error", list1 (newname));
 }
 #ifndef MSDOS
 chmod ((CONST char *) XSTRING_DATA (newname),
 	     st.st_mode & 07777);
 #else /* MSDOS */
 UNGCPRO;
 if (!NILP (handler))
 return call3 (handler, Qset_file_modes, abspath, mode);
 if (chmod ((char *) XSTRING_DATA (abspath), XINT (mode)) < 0)
-report_file_error ("Doing chmod", Fcons (abspath, Qnil));
+report_file_error ("Doing chmod", list1 (abspath));
 return Qnil;
 }
 DEFUN ("set-default-file-modes", Fset_default_file_modes, 1, 1, 0, /*
 )
 {
 if (fd >= 0) close (fd);
 badopen:
 if (NILP (visit))
-	report_file_error ("Opening input file",
+	report_file_error ("Opening input file", list1 (filename));
-			   Fcons (filename, Qnil));
 st.st_mtime = -1;
 goto notfound;
 }
 #ifdef S_IFREG
 	  if (curpos == 0)
 	    break;
 	  /* How much can we scan in the next step?  */
 	  trial = min (curpos, sizeof buffer);
 	  if (lseek (fd, curpos - trial, 0) < 0)
-	    report_file_error ("Setting file position",
+	    report_file_error ("Setting file position", list1 (filename));
-			       Fcons (filename, Qnil));
 	  total_read = 0;
 	  while (total_read < trial)
 	    {
 	      nread = read_allowing_quit (fd, buffer + total_read,
 					  trial - total_read);
 	      if (nread <= 0)
-		error ("IO error reading %s: %s",
+		report_file_error ("IO error reading file", list1 (filename));
-		       XSTRING_DATA (filename), strerror (errno));
 	      total_read += nread;
 	    }
 	  /* Scan this bufferful from the end, comparing with
 	     the Emacs buffer.  */
 	  bufpos = total_read;
 }
 #endif /* FSFMACS_SPEEDY_INSERT */
 if (!not_regular)
 {
-Lisp_Object temp;
 total = XINT (end) - XINT (beg);
 /* Make sure point-max won't overflow after this insertion.  */
-XSETINT (temp, total);
+if (total != XINT (make_int (total)))
-if (total != XINT (temp))
 	error ("Maximum buffer size exceeded");
 }
 else
 /* For a special file, all we can do is guess.  */
 total = READ_BUF_SIZE;
 || !NILP (replace)
 #endif /* !FSFMACS_SPEEDY_INSERT */
 )
 {
 if (lseek (fd, XINT (beg), 0) < 0)
-	report_file_error ("Setting file position",
+	report_file_error ("Setting file position", list1 (filename));
-			   Fcons (filename, Qnil));
 }
 {
 Bufpos cur_point = BUF_PT (buf);
 struct gcpro ngcpro1;
 inserted = XINT (insval);
 }
 if (inserted > 0)
 {
-Lisp_Object p = Vafter_insert_file_functions;
+Lisp_Object p;
 struct gcpro ngcpro1;
 NGCPRO1 (p);
-while (!NILP (p))
+EXTERNAL_LIST_LOOP (p, Vafter_insert_file_functions)
 	{
 	  Lisp_Object insval =
-	    call1 (Fcar (p), make_int (inserted));
+	    call1 (XCAR (p), make_int (inserted));
 	  if (!NILP (insval))
 	    {
 	      CHECK_NATNUM (insval);
 	      inserted = XINT (insval);
 	    }
 	  QUIT;
-	  p = Fcdr (p);
 	}
 NUNGCPRO;
 }
 UNGCPRO;
 #ifdef CLASH_DETECTION
 save_errno = errno;
 if (!auto_saving) unlock_file (lockname);
 errno = save_errno;
 #endif /* CLASH_DETECTION */
-report_file_error ("Opening output file",
+report_file_error ("Opening output file", list1 (filename));
-			 Fcons (filename, Qnil));
 }
 {
 Lisp_Object desc_locative = Fcons (make_int (desc), Qnil);
 Lisp_Object instream = Qnil, outstream = Qnil;

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 227:0e522484dd2a r20-5b12