emacs: src/fileio.c comparison

comparison src/fileio.c @ 90228:fa0da9b57058

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 542-553) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 116-121) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 19 Sep 2005 10:20:33 +0000
parents	2d92f5c9d6ae da6fcded2062
children	0ca0d9181b5e

comparison

equal deleted inserted replaced

-:10fe5fadaf89
+:fa0da9b57058
 int vms_stmlf_recfm;
 /* On NT, specifies the directory separator character, used (eg.) when
 expanding file names.  This can be bound to / or \. */
 Lisp_Object Vdirectory_sep_char;
+#ifdef HAVE_FSYNC
+/* Nonzero means skip the call to fsync in Fwrite-region.  */
+int write_region_inhibit_fsync;
+#endif
 extern Lisp_Object Vuser_login_name;
 #ifdef WINDOWSNT
 extern Lisp_Object Vw32_get_true_file_attributes;
 int collapse_newdir = 1;
 int is_escaped = 0;
 #endif /* DOS_NT */
 int length;
 Lisp_Object handler, result;
+int multibyte;
 CHECK_STRING (name);
 /* If the file name has special constructs in it,
 call the corresponding file handler.  */
 UNGCPRO;
 }
 name = FILE_SYSTEM_CASE (name);
 nm = SDATA (name);
+multibyte = STRING_MULTIBYTE (name);
 #ifdef DOS_NT
 /* We will force directory separators to be either all \ or /, so make
 a local copy to modify, even if there ends up being no change. */
 nm = strcpy (alloca (strlen (nm) + 1), nm);
 	{
 #ifdef VMS
 	  if (index (nm, '/'))
 	    {
 	      nm = sys_translate_unix (nm);
-	      return make_specified_string (nm, -1, strlen (nm),
+	      return make_specified_string (nm, -1, strlen (nm), multibyte);
-					    STRING_MULTIBYTE (name));
 	    }
 #endif /* VMS */
 #ifdef DOS_NT
 	  /* Make sure directories are all separated with / or \ as
 	     desired, but avoid allocation of a new string when not
 	  CORRECT_DIR_SEPS (nm);
 #ifdef WINDOWSNT
 	  if (IS_DIRECTORY_SEP (nm[1]))
 	    {
 	      if (strcmp (nm, SDATA (name)) != 0)
-		name = make_specified_string (nm, -1, strlen (nm),
+		name = make_specified_string (nm, -1, strlen (nm), multibyte);
-					      STRING_MULTIBYTE (name));
 	    }
 	  else
 #endif
 	  /* drive must be set, so this is okay */
 	  if (strcmp (nm - 2, SDATA (name)) != 0)
 	    {
 	      char temp[] = " :";
-	      name = make_specified_string (nm, -1, p - nm,
+	      name = make_specified_string (nm, -1, p - nm, multibyte);
-					    STRING_MULTIBYTE (name));
 	      temp[0] = DRIVE_LETTER (drive);
 	      name = concat2 (build_string (temp), name);
 	    }
 	  return name;
 #else /* not DOS_NT */
 	  if (nm == SDATA (name))
 	    return name;
-	  return make_specified_string (nm, -1, strlen (nm),
+	  return make_specified_string (nm, -1, strlen (nm), multibyte);
-					STRING_MULTIBYTE (name));
 #endif /* not DOS_NT */
 	}
 }
 /* At this point, nm might or might not be an absolute file name.  We
 && !index (nm, ':')
 #endif
 && !newdir)
 {
 newdir = SDATA (default_directory);
+multibyte |= STRING_MULTIBYTE (default_directory);
 #ifdef DOS_NT
 /* Note if special escape prefix is present, but remove for now.  */
 if (newdir[0] == '/' && newdir[1] == ':')
 	{
 	  is_escaped = 1;
 target[1] = ':';
 }
 CORRECT_DIR_SEPS (target);
 #endif /* DOS_NT */
-result = make_specified_string (target, -1, o - target,
+result = make_specified_string (target, -1, o - target, multibyte);
-STRING_MULTIBYTE (name));
 /* Again look to see if the file name has special constructs in it
 and perhaps call the corresponding file handler.  This is needed
 for filenames such as "/foo/../user@host:/bar/../baz".  Expanding
 the ".." component gives us "/user@host:/bar/../baz" which needs
 #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
 it, and that means the fsync here is not crucial for autosave files.  */
-if (!auto_saving && fsync (desc) < 0)
+if (!auto_saving && !write_region_inhibit_fsync && fsync (desc) < 0)
 {
 /* If fsync fails with EINTR, don't treat that as serious.  */
 if (errno != EINTR)
 	failure = 1, save_errno = errno;
 }
 Lisp_Object error;
 {
 Lisp_Object args[3], msg;
 int i, nbytes;
 struct gcpro gcpro1;
+char *msgbuf;
+USE_SAFE_ALLOCA;
 ring_bell ();
 args[0] = build_string ("Auto-saving %s: %s");
 args[1] = current_buffer->name;
 args[2] = Ferror_message_string (error);
 msg = Fformat (3, args);
 GCPRO1 (msg);
 nbytes = SBYTES (msg);
+SAFE_ALLOCA (msgbuf, char *, nbytes);
+bcopy (SDATA (msg), msgbuf, nbytes);
 for (i = 0; i < 3; ++i)
 {
 if (i == 0)
-	message2 (SDATA (msg), nbytes, STRING_MULTIBYTE (msg));
+	message2 (msgbuf, nbytes, STRING_MULTIBYTE (msg));
 else
-	message2_nolog (SDATA (msg), nbytes, STRING_MULTIBYTE (msg));
+	message2_nolog (msgbuf, nbytes, STRING_MULTIBYTE (msg));
 Fsleep_for (make_number (1), Qnil);
 }
 UNGCPRO;
 return Qnil;
 	       doc: /* File name in which we write a list of all auto save file names.
 This variable is initialized automatically from `auto-save-list-file-prefix'
 shortly after Emacs reads your `.emacs' file, if you have not yet given it
 a non-nil value.  */);
 Vauto_save_list_file_name = Qnil;
+#ifdef HAVE_FSYNC
+DEFVAR_BOOL ("write-region-inhibit-fsync", &write_region_inhibit_fsync,
+	       doc: /* *Non-nil means don't call fsync in `write-region'.
+This variable affects calls to `write-region' as well as save commands.
+A non-nil value may result in data loss!  */);
+write_region_inhibit_fsync = 0;
+#endif
 defsubr (&Sfind_file_name_handler);
 defsubr (&Sfile_name_directory);
 defsubr (&Sfile_name_nondirectory);
 defsubr (&Sunhandled_file_name_directory);

Mercurial > emacs

comparison src/fileio.c @ 90228:fa0da9b57058