xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 363:972bbb6d6ca2 r21-1-11

Import from CVS: tag r21-1-11

author	cvs
date	Mon, 13 Aug 2007 10:59:28 +0200
parents	7347b34c275b
children	a4f53d9b3154

comparison

equal deleted inserted replaced

-:1e474c183006
+:972bbb6d6ca2
 An initial `~USER/' expands to USER's home directory.
 See also the function `substitute-in-file-name'.
 */
 (name, default_directory))
 {
-/* This function can GC */
+/* This function can GC.  GC-checked 7-11-00 ben */
 Bufbyte *nm;
 Bufbyte *newdir, *p, *o;
 int tlen;
 Bufbyte *target;
 int length;
 Lisp_Object handler;
 #ifdef __CYGWIN32__
 char *user;
 #endif
+struct gcpro gcpro1, gcpro2;
+/* both of these get set below */
+GCPRO2 (name, default_directory);
 CHECK_STRING (name);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
 handler = Ffind_file_name_handler (name, Qexpand_file_name);
 if (!NILP (handler))
-return call3_check_string (handler, Qexpand_file_name, name,
+{
-			       default_directory);
+UNGCPRO;
+return call3_check_string (handler, Qexpand_file_name, name,
+				 default_directory);
+}
 /* Use the buffer's default-directory if DEFAULT_DIRECTORY is omitted.  */
 if (NILP (default_directory))
 default_directory = current_buffer->directory;
 if (! STRINGP (default_directory))
 if (!NILP (default_directory))
 {
 handler = Ffind_file_name_handler (default_directory, Qexpand_file_name);
 if (!NILP (handler))
-	return call3 (handler, Qexpand_file_name, name, default_directory);
+	{
+	  UNGCPRO;
+	  return call3 (handler, Qexpand_file_name, name, default_directory);
+	}
 }
 o = XSTRING_DATA (default_directory);
 /* Make sure DEFAULT_DIRECTORY is properly expanded.
 /* Detect Unix absolute file names (/... alone is not absolute on
 	 DOS or Windows).  */
 && ! (IS_DIRECTORY_SEP (o[0]))
 #endif /* not WINDOWSNT */
 )
-{
-struct gcpro gcpro1;
+default_directory = Fexpand_file_name (default_directory, Qnil);
-GCPRO1 (name);
-default_directory = Fexpand_file_name (default_directory, Qnil);
-UNGCPRO;
-}
 #ifdef FILE_SYSTEM_CASE
 name = FILE_SYSTEM_CASE (name);
 #endif
 	    {
 	      name = make_string (nm - 2, p - nm + 2);
 	      XSTRING_DATA (name)[0] = DRIVE_LETTER (drive);
 	      XSTRING_DATA (name)[1] = ':';
 	    }
-	  return name;
+	  RETURN_UNGCPRO (name);
 #else /* not WINDOWSNT */
 	  if (nm == XSTRING_DATA (name))
-	    return name;
+	    RETURN_UNGCPRO (name);
-	  return build_string ((char *) nm);
+	  RETURN_UNGCPRO (build_string ((char *) nm));
 #endif /* not WINDOWSNT */
 	}
 }
 /* At this point, nm might or might not be an absolute file name.  We
 abort ();
 }
 CORRECT_DIR_SEPS (target);
 #endif /* WINDOWSNT */
-return make_string (target, o - target);
+RETURN_UNGCPRO (make_string (target, o - target));
 }
 #if 0 /* FSFmacs */
 /* another older version of expand-file-name; */
 #endif
 Return t if file FILENAME exists.  (This does not mean you can read it.)
 See also `file-readable-p' and `file-attributes'.
 */
 (filename))
 {
-/* This function can call lisp */
+/* This function can call lisp; GC checked 7-11-00 ben */
 Lisp_Object abspath;
 Lisp_Object handler;
 struct stat statbuf;
 struct gcpro gcpro1;
 For a directory, this means you can access files in that directory.
 */
 (filename))
 {
-/* This function can GC.  GC checked 1997.04.10. */
+/* This function can GC.  GC checked 07-11-2000 ben. */
 Lisp_Object abspath;
 Lisp_Object handler;
 struct gcpro gcpro1;
 CHECK_STRING (filename);
 /* This function can call lisp */
 int desc;
 int failure;
 int save_errno = 0;
 struct stat st;
-Lisp_Object fn;
+Lisp_Object fn = Qnil;
 int speccount = specpdl_depth ();
 int visiting_other = STRINGP (visit);
 int visiting = (EQ (visit, Qt) || visiting_other);
 int quietly = (!visiting && !NILP (visit));
 Lisp_Object visit_file = Qnil;
 Lisp_Object annotations = Qnil;
 struct buffer *given_buffer;
 Bufpos start1, end1;
+struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-/* #### dmoore - if Fexpand_file_name or handlers kill the buffer,
+struct gcpro ngcpro1, ngcpro2;
+Lisp_Object curbuf;
+XSETBUFFER (curbuf, current_buffer);
+/* start, end, visit, and append are never modified in this fun
+so we don't protect them. */
+GCPRO5 (visit_file, filename, codesys, lockname, annotations);
+NGCPRO2 (curbuf, fn);
+/* [[ dmoore - if Fexpand_file_name or handlers kill the buffer,
 we should signal an error rather than blissfully continuing
 along.  ARGH, this function is going to lose lose lose.  We need
 to protect the current_buffer from being destroyed, but the
-multiple return points make this a pain in the butt. */
+multiple return points make this a pain in the butt. ]] we do
+protect curbuf now. --ben */
 #ifdef FILE_CODING
 codesys = Fget_coding_system (codesys);
 #endif /* FILE_CODING */
 if (!NILP (start) && !STRINGP (start))
 get_buffer_range_char (current_buffer, start, end, &start1, &end1, 0);
 {
 Lisp_Object handler;
-struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-GCPRO5 (start, filename, visit, visit_file, lockname);
 if (visiting_other)
 visit_file = Fexpand_file_name (visit, Qnil);
 else
 visit_file = filename;
 filename = Fexpand_file_name (filename, Qnil);
-UNGCPRO;
 if (NILP (lockname))
 lockname = visit_file;
+/* We used to UNGCPRO here.  BAD!  visit_file is used below after
+more Lisp calling. */
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
 handler = Ffind_file_name_handler (filename, Qwrite_region);
 /* If FILENAME has no handler, see if VISIT has one.  */
 if (NILP (handler) && STRINGP (visit))
 	    BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
 	    current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
 	    current_buffer->filename = visit_file;
 	    MARK_MODELINE_CHANGED;
 	  }
+	NUNGCPRO;
+	UNGCPRO;
 	return val;
 }
 }
 #ifdef CLASH_DETECTION
 if (!auto_saving)
-{
+lock_file (lockname);
-Lisp_Object curbuf;
-struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-XSETBUFFER (curbuf, current_buffer);
-GCPRO5 (start, filename, visit_file, lockname, curbuf);
-lock_file (lockname);
-UNGCPRO;
-}
 #endif /* CLASH_DETECTION */
 /* Special kludge to simplify auto-saving.  */
 if (NILP (start))
 {
 }
 {
 Lisp_Object desc_locative = Fcons (make_int (desc), Qnil);
 Lisp_Object instream = Qnil, outstream = Qnil;
-struct gcpro gcpro1, gcpro2;
+struct gcpro nngcpro1, nngcpro2;
 /* need to gcpro; QUIT could happen out of call to write() */
-GCPRO2 (instream, outstream);
+NNGCPRO2 (instream, outstream);
 record_unwind_protect (close_file_unwind, desc_locative);
 if (!NILP (append))
 {
 {
 	failure = 1;
 	save_errno = errno;
 }
 Lstream_close (XLSTREAM (instream));
-UNGCPRO;
 #ifdef HAVE_FSYNC
 /* Note fsync appears to change the modtime on BSD4.2 (both vax and sun).
 Disk full in NFS may be reported here.  */
 /* mib says that closing the file will try to write as fast as NFS can do
 /* Discard the close unwind-protect.  Execute the one for
 build_annotations (switches back to the original current buffer
 as necessary). */
 XCAR (desc_locative) = Qnil;
 unbind_to (speccount, Qnil);
+NNUNGCPRO;
 }
 /*
 * stat the file after the file is closed to avoid having the
 * modtime change on us when the file is closed.
 current_buffer->filename = visit_file;
 MARK_MODELINE_CHANGED;
 }
 else if (quietly)
 {
+NUNGCPRO;
+UNGCPRO;
 return Qnil;
 }
 if (!auto_saving)
 {
 if (visiting_other)
 message ("Wrote %s", XSTRING_DATA (visit_file));
 else
 	{
-	  struct gcpro gcpro1;
 	  Lisp_Object fsp;
-	  GCPRO1 (fn);
+	  struct gcpro nngcpro1;
+	  NNGCPRO1 (fsp);
 	  fsp = Ffile_symlink_p (fn);
 	  if (NILP (fsp))
 	    message ("Wrote %s", XSTRING_DATA (fn));
 	  else
 	    message ("Wrote %s (symlink to %s)",
 		     XSTRING_DATA (fn), XSTRING_DATA (fsp));
-	  UNGCPRO;
+	  NNUNGCPRO;
 	}
 }
+NUNGCPRO;
+UNGCPRO;
 return Qnil;
 }
 /* #### This is such a load of shit!!!!  There is no way we should define
 something so stupid as a subr, just sort the fucking list more
 Return t if last mod time of BUF's visited file matches what BUF records.
 This means that the file has not been changed since it was visited or saved.
 */
 (buf))
 {
-/* This function can call lisp */
+/* This function can call lisp; GC checked 7-11-00 ben */
 struct buffer *b;
 struct stat st;
 Lisp_Object handler;
 CHECK_BUFFER (buf);

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 363:972bbb6d6ca2 r21-1-11