xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 444:576fb035e263 r21-2-37

Import from CVS: tag r21-2-37

author	cvs
date	Mon, 13 Aug 2007 11:36:19 +0200
parents	abe6d1db359e
children	1ccc32a20af4

comparison

equal deleted inserted replaced

-:a8296e22da4e
+:576fb035e263
 this holds the annotations made by the previous functions.  */
 Lisp_Object Vwrite_region_annotations_so_far;
 /* File name in which we write a list of all our auto save files.  */
 Lisp_Object Vauto_save_list_file_name;
+/* Prefix used to construct Vauto_save_list_file_name. */
+Lisp_Object Vauto_save_list_file_prefix;
+/* When non-nil, it prevents auto-save list file creation. */
+int inhibit_auto_save_session;
 int disable_auto_save_when_buffer_shrinks;
 Lisp_Object Vdirectory_sep_char;
 return result;
 }
 DEFUN ("file-name-directory", Ffile_name_directory, 1, 1, 0, /*
-Return the directory component in file name NAME.
+Return the directory component in file name FILENAME.
-Return nil if NAME does not include a directory.
+Return nil if FILENAME does not include a directory.
 Otherwise return a directory spec.
 Given a Unix syntax file name, returns a string ending in slash.
 */
-(file))
+(filename))
 {
 /* This function can GC.  GC checked 2000-07-28 ben */
 Bufbyte *beg;
 Bufbyte *p;
 Lisp_Object handler;
-CHECK_STRING (file);
+CHECK_STRING (filename);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
-handler = Ffind_file_name_handler (file, Qfile_name_directory);
+handler = Ffind_file_name_handler (filename, Qfile_name_directory);
 if (!NILP (handler))
-return call2_check_string_or_nil (handler, Qfile_name_directory, file);
+return call2_check_string_or_nil (handler, Qfile_name_directory, filename);
 #ifdef FILE_SYSTEM_CASE
-file = FILE_SYSTEM_CASE (file);
+filename = FILE_SYSTEM_CASE (filename);
 #endif
-beg = XSTRING_DATA (file);
+beg = XSTRING_DATA (filename);
-p = beg + XSTRING_LENGTH (file);
+p = beg + XSTRING_LENGTH (filename);
 while (p != beg && !IS_ANY_SEP (p[-1])
 #ifdef WIN32_NATIVE
 	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':' && p == beg + 2)
 #endif /* WIN32_NATIVE */
 return make_string (beg, p - beg);
 }
 DEFUN ("file-name-nondirectory", Ffile_name_nondirectory, 1, 1, 0, /*
-Return file name NAME sans its directory.
+Return file name FILENAME sans its directory.
 For example, in a Unix-syntax file name,
 this is everything after the last slash,
 or the entire name if it contains no slash.
 */
-(file))
+(filename))
 {
 /* This function can GC.  GC checked 2000-07-28 ben */
 Bufbyte *beg, *p, *end;
 Lisp_Object handler;
-CHECK_STRING (file);
+CHECK_STRING (filename);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
-handler = Ffind_file_name_handler (file, Qfile_name_nondirectory);
+handler = Ffind_file_name_handler (filename, Qfile_name_nondirectory);
 if (!NILP (handler))
-return call2_check_string (handler, Qfile_name_nondirectory, file);
+return call2_check_string (handler, Qfile_name_nondirectory, filename);
-beg = XSTRING_DATA (file);
+beg = XSTRING_DATA (filename);
-end = p = beg + XSTRING_LENGTH (file);
+end = p = beg + XSTRING_LENGTH (filename);
 while (p != beg && !IS_ANY_SEP (p[-1])
 #ifdef WIN32_NATIVE
 	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':' && p == beg + 2)
 If FILENAME is a directly usable file itself, return
 \(file-name-directory FILENAME).
 The `call-process' and `start-process' functions use this function to
 get a current directory to run processes in.
 */
 (filename))
 {
 /* This function can GC.  GC checked 2000-07-28 ben */
 Lisp_Object handler;
 /* If the file name has special constructs in it,
 The result can be used as the value of `default-directory'
 or passed as second argument to `expand-file-name'.
 For a Unix-syntax file name, just appends a slash,
 except for (file-name-as-directory \"\") => \"./\".
 */
-(file))
+(filename))
 {
 /* This function can GC.  GC checked 2000-07-28 ben */
 char *buf;
 Lisp_Object handler;
-CHECK_STRING (file);
+CHECK_STRING (filename);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
-handler = Ffind_file_name_handler (file, Qfile_name_as_directory);
+handler = Ffind_file_name_handler (filename, Qfile_name_as_directory);
 if (!NILP (handler))
-return call2_check_string (handler, Qfile_name_as_directory, file);
+return call2_check_string (handler, Qfile_name_as_directory, filename);
-buf = (char *) alloca (XSTRING_LENGTH (file) + 10);
+buf = (char *) alloca (XSTRING_LENGTH (filename) + 10);
 return build_string (file_name_as_directory
-		       (buf, (char *) XSTRING_DATA (file)));
+		       (buf, (char *) XSTRING_DATA (filename)));
 }
 /*
 * Convert from directory name to filename.
 * On UNIX, it's simple: just make sure there isn't a terminating /
 dst[slen - 1] = 0;
 return 1;
 }
 DEFUN ("directory-file-name", Fdirectory_file_name, 1, 1, 0, /*
-Return the file name of the directory named DIR.
+Return the file name of the directory named DIRECTORY.
-This is the name of the file that holds the data for the directory DIR.
+This is the name of the file that holds the data for the directory.
 This operation exists because a directory is also a file, but its name as
 a directory is different from its name as a file.
 In Unix-syntax, this function just removes the final slash.
 */
 (directory))
 DEFUN ("expand-file-name", Fexpand_file_name, 1, 2, 0, /*
 Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
 (does not start with slash); if DEFAULT-DIRECTORY is nil or missing,
-the current buffer's value of default-directory is used.
+the current buffer's value of `default-directory' is used.
 File name components that are `.' are removed, and
 so are file name components followed by `..', along with the `..' itself;
 note that these simplifications are done without checking the resulting
 file names in the file system.
 An initial `~/' expands to your home directory.
 RETURN_UNGCPRO (make_string (target, o - target));
 }
 DEFUN ("file-truename", Ffile_truename, 1, 2, 0, /*
-Return the canonical name of the given FILE.
+Return the canonical name of FILENAME.
-Second arg DEFAULT is directory to start with if FILE is relative
+Second arg DEFAULT is directory to start with if FILENAME is relative
 (does not start with slash); if DEFAULT is nil or missing,
-the current buffer's value of default-directory is used.
+the current buffer's value of `default-directory' is used.
 No component of the resulting pathname will be a symbolic link, as
 in the realpath() function.
 */
 (filename, default_))
 {
 DEFUN ("substitute-in-file-name", Fsubstitute_in_file_name, 1, 1, 0, /*
 Substitute environment variables referred to in FILENAME.
 `$FOO' where FOO is an environment variable name means to substitute
 the value of that variable.  The variable name should be terminated
-with a character not a letter, digit or underscore; otherwise, enclose
+with a character, not a letter, digit or underscore; otherwise, enclose
 the entire variable name in braces.
 If `/~' appears, all of FILENAME through that `/' is discarded.
+*/
-*/
+(filename))
-(string))
 {
 /* This function can GC.  GC checked 2000-07-28 ben. */
 Bufbyte *nm;
 Bufbyte *s, *p, *o, *x, *endp;
 int total = 0;
 int substituted = 0;
 Bufbyte *xnm;
 Lisp_Object handler;
-CHECK_STRING (string);
+CHECK_STRING (filename);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
-handler = Ffind_file_name_handler (string, Qsubstitute_in_file_name);
+handler = Ffind_file_name_handler (filename, Qsubstitute_in_file_name);
 if (!NILP (handler))
 return call2_check_string_or_nil (handler, Qsubstitute_in_file_name,
-				      string);
+				      filename);
-nm = XSTRING_DATA (string);
+nm = XSTRING_DATA (filename);
-endp = nm + XSTRING_LENGTH (string);
+endp = nm + XSTRING_LENGTH (filename);
 /* If /~ or // appears, discard everything through first slash. */
 for (p = nm; p != endp; p++)
 {
 	total += strlen ((char *) o);
 	substituted = 1;
 }
 if (!substituted)
-return string;
+return filename;
-/* If substitution required, recopy the string and do it */
+/* If substitution required, recopy the filename and do it */
 /* Make space in stack frame for the new copy */
-xnm = (Bufbyte *) alloca (XSTRING_LENGTH (string) + total + 1);
+xnm = (Bufbyte *) alloca (XSTRING_LENGTH (filename) + total + 1);
 x = xnm;
 /* Copy the rest of the name through, replacing $ constructs with values */
 for (p = nm; *p;)
 if (*p != '$')
 #endif
 return make_string (xnm, x - xnm);
 badsubst:
-syntax_error ("Bad format environment-variable substitution", string);
+syntax_error ("Bad format environment-variable substitution", filename);
 missingclose:
 syntax_error ("Missing \"}\" in environment-variable substitution",
-		string);
+		filename);
 badvar:
 syntax_error_2 ("Substituting nonexistent environment variable",
-		  string, build_string (target));
+		  filename, build_string ((char *) target));
 /* NOTREACHED */
 return Qnil;	/* suppress compiler warning */
 }
 return;
 }
 DEFUN ("copy-file", Fcopy_file, 2, 4,
 "fCopy file: \nFCopy %s to file: \np\nP", /*
-Copy FILE to NEWNAME.  Both args must be strings.
+Copy FILENAME to NEWNAME.  Both args must be strings.
 Signals a `file-already-exists' error if file NEWNAME already exists,
 unless a third argument OK-IF-ALREADY-EXISTS is supplied and non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 Fourth arg KEEP-TIME non-nil means give the new file the same
 				 internal_delete_file_1, Qnil));
 }
 DEFUN ("rename-file", Frename_file, 2, 3,
 "fRename file: \nFRename %s to file: \np", /*
-Rename FILE as NEWNAME.  Both args strings.
+Rename FILENAME as NEWNAME.  Both args must be strings.
-If file has names other than FILE, it continues to have those names.
+If file has names other than FILENAME, it continues to have those names.
 Signals a `file-already-exists' error if a file NEWNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 */
 return Qnil;
 }
 DEFUN ("add-name-to-file", Fadd_name_to_file, 2, 3,
 "fAdd name to file: \nFName to add to %s: \np", /*
-Give FILE additional name NEWNAME.  Both args strings.
+Give FILENAME additional name NEWNAME.  Both args must be strings.
 Signals a `file-already-exists' error if a file NEWNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
 A number as third arg means request confirmation if NEWNAME already exists.
 This is what happens in interactive use with M-x.
 */
 return Qnil;
 return (st.st_mode & S_IFMT) == S_IFREG ? Qt : Qnil;
 }
 DEFUN ("file-modes", Ffile_modes, 1, 1, 0, /*
-Return mode bits of FILE, as an integer.
+Return mode bits of file named FILENAME, as an integer.
 */
 (filename))
 {
 /* This function can GC.  GC checked 1997.04.10. */
 Lisp_Object abspath;
 return make_int (st.st_mode & 07777);
 }
 DEFUN ("set-file-modes", Fset_file_modes, 2, 2, 0, /*
-Set mode bits of FILE to MODE (an integer).
+Set mode bits of file named FILENAME to MODE (an integer).
 Only the 12 low bits of MODE are used.
 */
 (filename, mode))
 {
 /* This function can GC.  GC checked 1997.04.10. */
 return Qnil;
 }
 DEFUN ("set-default-file-modes", Fset_default_file_modes, 1, 1, 0, /*
 Set the file permission bits for newly created files.
-MASK should be an integer; if a permission's bit in MASK is 1,
+The argument MODE should be an integer; if a bit in MODE is 1,
-subsequently created files will not have that permission enabled.
+subsequently created files will not have the permission corresponding
-Only the low 9 bits are used.
+to that bit enabled.  Only the low 9 bits are used.
 This setting is inherited by subprocesses.
 */
 (mode))
 {
 CHECK_INT (mode);
 to CODESYS; if omitted, no conversion happens.  If USED-CODESYS is non-nil,
 it should be a symbol, and the actual coding system that was used for the
 decoding is stored into it.  It will in general be different from CODESYS
 if CODESYS specifies automatic encoding detection or end-of-line detection.
-Currently BEG and END refer to byte positions (as opposed to character
+Currently START and END refer to byte positions (as opposed to character
 positions), even in Mule. (Fixing this is very difficult.)
 */
-(filename, visit, beg, end, replace, codesys, used_codesys))
+(filename, visit, start, end, replace, codesys, used_codesys))
 {
 /* This function can call lisp */
-/* #### dmoore - this function hasn't been checked for gc recently */
 struct stat st;
 int fd;
 int saverrno = 0;
 Charcount inserted = 0;
 int speccount;
 call the corresponding file handler.  */
 handler = Ffind_file_name_handler (filename, Qinsert_file_contents);
 if (!NILP (handler))
 {
 val = call6 (handler, Qinsert_file_contents, filename,
-		   visit, beg, end, replace);
+		   visit, start, end, replace);
 goto handled;
 }
 #ifdef FILE_CODING
 if (!NILP (used_codesys))
 CHECK_SYMBOL (used_codesys);
 #endif
-if ( (!NILP (beg) || !NILP (end)) && !NILP (visit) )
+if ( (!NILP (start) || !NILP (end)) && !NILP (visit) )
 error ("Attempt to visit less than an entire file");
 fd = -1;
 if (xemacs_stat ((char *) XSTRING_DATA (filename), &st) < 0)
 goto notfound;
 }
 #ifdef S_IFREG
 /* Signal an error if we are accessing a non-regular file, with
-REPLACE, BEG or END being non-nil.  */
+REPLACE, START or END being non-nil.  */
 if (!S_ISREG (st.st_mode))
 {
 not_regular = 1;
 if (!NILP (visit))
 	goto notfound;
-if (!NILP (replace) || !NILP (beg) || !NILP (end))
+if (!NILP (replace) || !NILP (start) || !NILP (end))
 	{
 	  end_multiple_change (buf, mc_count);
-	  return Fsignal (Qfile_error,
+	  RETURN_UNGCPRO
-			  list2 (build_translated_string("not a regular file"),
+	    (Fsignal (Qfile_error,
-				 filename));
+		      list2 (build_translated_string("not a regular file"),
+			     filename)));
 	}
 }
 #endif /* S_IFREG */
-if (!NILP (beg))
+if (!NILP (start))
-CHECK_INT (beg);
+CHECK_INT (start);
 else
-beg = Qzero;
+start = Qzero;
 if (!NILP (end))
 CHECK_INT (end);
 if (fd < 0)
 	(same_at_end + st.st_size - BUF_ZV (buf));
 if (overlap > 0)
 	same_at_end += overlap;
 /* Arrange to read only the nonmatching middle part of the file.  */
-beg = make_int (same_at_start - BUF_BEGV (buf));
+start = make_int (same_at_start - BUF_BEGV (buf));
 end = make_int (st.st_size - (BUF_ZV (buf) - same_at_end));
 buffer_delete_range (buf, same_at_start, same_at_end,
 			   !NILP (visit) ? INSDEL_NO_LOCKING : 0);
 /* Insert from the file at the proper position.  */
 }
 #endif /* FSFMACS_SPEEDY_INSERT */
 if (!not_regular)
 {
-total = XINT (end) - XINT (beg);
+total = XINT (end) - XINT (start);
 /* Make sure point-max won't overflow after this insertion.  */
 if (total != XINT (make_int (total)))
 	error ("Maximum buffer size exceeded");
 }
 else
 /* For a special file, all we can do is guess.  The value of -1
 will make the stream functions read as much as possible.  */
 total = -1;
-if (XINT (beg) != 0
+if (XINT (start) != 0
 #ifdef FSFMACS_SPEEDY_INSERT
 /* why was this here? asked jwz.  The reason is that the replace-mode
 	 connivings above will normally put the file pointer other than
 	 where it should be. */
 || !NILP (replace)
 #endif /* !FSFMACS_SPEEDY_INSERT */
 )
 {
-if (lseek (fd, XINT (beg), 0) < 0)
+if (lseek (fd, XINT (start), 0) < 0)
 	report_file_error ("Setting file position", list1 (filename));
 }
 {
 Bufpos cur_point = BUF_PT (buf);
 	  /* XEmacs addition: */
 	  /* This function used to be in C, ostensibly so that
 	     it could be called here.  But that's just silly.
 	     There's no reason C code can't call out to Lisp
 	     code, and it's a lot cleaner this way. */
+	  /*  Note: compute-buffer-file-truename is called for
+	      side-effect!  Its return value is intentionally
+	      ignored. */
 	  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);
 }
 #endif /* 0 */
 DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime, 1, 1, 0, /*
-Return t if last mod time of BUF's visited file matches what BUF records.
+Return t if last mod time of BUFFER's visited file matches what BUFFER records.
 This means that the file has not been changed since it was visited or saved.
 */
-(buf))
+(buffer))
 {
 /* This function can call lisp; GC checked 2000-07-11 ben */
 struct buffer *b;
 struct stat st;
 Lisp_Object handler;
-CHECK_BUFFER (buf);
+CHECK_BUFFER (buffer);
-b = XBUFFER (buf);
+b = XBUFFER (buffer);
 if (!STRINGP (b->filename)) return Qt;
 if (b->modtime == 0) return Qt;
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
 handler = Ffind_file_name_handler (b->filename,
 Qverify_visited_file_modtime);
 if (!NILP (handler))
-return call2 (handler, Qverify_visited_file_modtime, buf);
+return call2 (handler, Qverify_visited_file_modtime, buffer);
 if (xemacs_stat ((char *) XSTRING_DATA (b->filename), &st) < 0)
 {
 /* If the file doesn't exist now and didn't exist before,
 	 we say that it isn't modified, provided the error is a tame one.  */
 		}
 	      /* Open the auto-save list file, if necessary.
 		 We only do this now so that the file only exists
 		 if we actually auto-saved any files. */
-	      if (!auto_saved && STRINGP (listfile) && listdesc < 0)
+	      if (!auto_saved && !inhibit_auto_save_session
+		  && !NILP (Vauto_save_list_file_prefix)
+		  && STRINGP (listfile) && listdesc < 0)
 		{
 		  listdesc = open ((char *) XSTRING_DATA (listfile),
 				   O_WRONLY | O_TRUNC | O_CREAT | OPEN_BINARY,
 				   CREAT_MODE);
 DEFVAR_LISP ("auto-save-list-file-name", &Vauto_save_list_file_name /*
 File name in which we write a list of all auto save file names.
 */ );
 Vauto_save_list_file_name = Qnil;
+DEFVAR_LISP ("auto-save-list-file-prefix", &Vauto_save_list_file_prefix /*
+Prefix for generating auto-save-list-file-name.
+Emacs's pid and the system name will be appended to
+this prefix to create a unique file name.
+*/ );
+Vauto_save_list_file_prefix = build_string ("~/.saves-");
+DEFVAR_BOOL ("inhibit-auto-save-session", &inhibit_auto_save_session /*
+When non-nil, inhibit auto save list file creation.
+*/ );
+inhibit_auto_save_session = 0;
 DEFVAR_BOOL ("disable-auto-save-when-buffer-shrinks",
 	       &disable_auto_save_when_buffer_shrinks /*
 If non-nil, auto-saving is disabled when a buffer shrinks too much.
 This is to prevent you from losing your edits if you accidentally
 delete a large chunk of the buffer and don't notice it until too late.

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 444:576fb035e263 r21-2-37