xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	de805c49cfc1
children	11054d720c21

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 /* 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"
 #ifdef HPUX_PRE_8_0
 #include <errnet.h>
 #endif /* HPUX_PRE_8_0 */
 #endif /* HPUX */
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
+#define NOMINMAX 1
+#include <windows.h>
+#include <direct.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#endif /* not WINDOWSNT */
+#ifdef WINDOWSNT
+#define CORRECT_DIR_SEPS(s) \
+do { if ('/' == DIRECTORY_SEP) dostounix_filename (s); \
+else unixtodos_filename (s); \
+} while (0)
 #define IS_DRIVE(x) isalpha (x)
 /* Need to lower-case the drive letter, or else expanded
 filenames will sometimes compare inequal, because
 `expand-file-name' doesn't always down-case the drive letter.  */
-#define DRIVE_LETTER(x) tolower (x)
+#define DRIVE_LETTER(x) (tolower (x))
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 int lisp_to_time (Lisp_Object, time_t *);
 Lisp_Object time_to_lisp (time_t);
 /* Nonzero during writing of auto-save files */
 /* File name in which we write a list of all our auto save files.  */
 Lisp_Object Vauto_save_list_file_name;
 int disable_auto_save_when_buffer_shrinks;
+Lisp_Object Qfile_name_handler_alist;
 Lisp_Object Vdirectory_sep_char;
 /* These variables describe handlers that have "already" had a chance
 to handle the current operation.
 EXFUN (Frunning_temacs_p, 0);
 /* signal a file error when errno contains a meaningful value. */
 DOESNT_RETURN
-report_file_error (const char *string, Lisp_Object data)
+report_file_error (CONST char *string, Lisp_Object data)
 {
 /* #### dmoore - This uses current_buffer, better make sure no one
 has GC'd the current buffer.  File handlers are giving me a headache
 maybe I'll just always protect current_buffer around all of those
 calls. */
 Fcons (build_translated_string (string),
 		       Fcons (lisp_strerror (errno), data)));
 }
 void
-maybe_report_file_error (const char *string, Lisp_Object data,
+maybe_report_file_error (CONST char *string, Lisp_Object data,
 			 Lisp_Object class, Error_behavior errb)
 {
 /* Optimization: */
 if (ERRB_EQ (errb, ERROR_ME_NOT))
 return;
 }
 /* signal a file error when errno does not contain a meaningful value. */
 DOESNT_RETURN
-signal_file_error (const char *string, Lisp_Object data)
+signal_file_error (CONST char *string, Lisp_Object data)
 {
 signal_error (Qfile_error,
 list2 (build_translated_string (string), data));
 }
 void
-maybe_signal_file_error (const char *string, Lisp_Object data,
+maybe_signal_file_error (CONST char *string, Lisp_Object data,
 			 Lisp_Object class, Error_behavior errb)
 {
 /* Optimization: */
 if (ERRB_EQ (errb, ERROR_ME_NOT))
 return;
 		      list2 (build_translated_string (string), data),
 		      class, errb);
 }
 DOESNT_RETURN
-signal_double_file_error (const char *string1, const char *string2,
+signal_double_file_error (CONST char *string1, CONST char *string2,
 			  Lisp_Object data)
 {
 signal_error (Qfile_error,
 list3 (build_translated_string (string1),
 		       build_translated_string (string2),
 		       data));
 }
 void
-maybe_signal_double_file_error (const char *string1, const char *string2,
+maybe_signal_double_file_error (CONST char *string1, CONST char *string2,
 				Lisp_Object data, Lisp_Object class,
 				Error_behavior errb)
 {
 /* Optimization: */
 if (ERRB_EQ (errb, ERROR_ME_NOT))
 			     data),
 		      class, errb);
 }
 DOESNT_RETURN
-signal_double_file_error_2 (const char *string1, const char *string2,
+signal_double_file_error_2 (CONST char *string1, CONST char *string2,
 			    Lisp_Object data1, Lisp_Object data2)
 {
 signal_error (Qfile_error,
 list4 (build_translated_string (string1),
 		       build_translated_string (string2),
 		       data1, data2));
 }
 void
-maybe_signal_double_file_error_2 (const char *string1, const char *string2,
+maybe_signal_double_file_error_2 (CONST char *string1, CONST char *string2,
 				  Lisp_Object data1, Lisp_Object data2,
 				  Lisp_Object class, Error_behavior errb)
 {
 /* Optimization: */
 if (ERRB_EQ (errb, ERROR_ME_NOT))
 The string needs to be converted since it may be localized.
 Perhaps this should use strerror-coding-system instead? */
 Lisp_Object
 lisp_strerror (int errnum)
 {
-return build_ext_string (strerror (errnum), Qnative);
+return build_ext_string (strerror (errnum), FORMAT_NATIVE);
 }
 static Lisp_Object
 close_file_unwind (Lisp_Object fd)
 {
 /* Versions of read() and write() that allow quitting out of the actual
 I/O.  We don't use immediate_quit (i.e. direct longjmp() out of the
 signal handler) because that's way too losing.
 (#### Actually, longjmp()ing out of the signal handler may not be
-as losing as I thought.  See sys_do_signal() in sysdep.c.) */
+as losing as I thought.  See sys_do_signal() in sysdep.c.)
-ssize_t
+Solaris include files declare the return value as ssize_t.
+Is that standard? */
+int
 read_allowing_quit (int fildes, void *buf, size_t size)
 {
 QUIT;
 return sys_read_1 (fildes, buf, size, 1);
 }
-ssize_t
+int
-write_allowing_quit (int fildes, const void *buf, size_t size)
+write_allowing_quit (int fildes, CONST void *buf, size_t size)
 {
 QUIT;
 return sys_write_1 (fildes, buf, size, 1);
 }
 #endif
 beg = XSTRING_DATA (file);
 p = beg + XSTRING_LENGTH (file);
 while (p != beg && !IS_ANY_SEP (p[-1])
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':' && p == beg + 2)
 #endif
 ) p--;
 if (p == beg)
 return Qnil;
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 /* Expansion of "c:" to drive and default directory.  */
 /* (NT does the right thing.)  */
 if (p == beg + 2 && beg[1] == ':')
 {
 /* MAXPATHLEN+1 is guaranteed to be enough space for getdefdir.  */
-Bufbyte *res = (Bufbyte*) alloca (MAXPATHLEN + 1);
+Bufbyte *res = alloca (MAXPATHLEN + 1);
-if (_getdcwd (toupper (*beg) - 'A' + 1, (char *)res, MAXPATHLEN))
+if (getdefdir (toupper (*beg) - 'A' + 1, res))
 	{
 	  char *c=((char *) res) + strlen ((char *) res);
 	  if (!IS_DIRECTORY_SEP (*c))
 	    {
 	      *c++ = DIRECTORY_SEP;
 	    }
 	  beg = res;
 	  p = beg + strlen ((char *) beg);
 	}
 }
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 return make_string (beg, p - beg);
 }
 DEFUN ("file-name-nondirectory", Ffile_name_nondirectory, 1, 1, 0, /*
 Return file name NAME sans its directory.
 beg = XSTRING_DATA (file);
 end = p = beg + XSTRING_LENGTH (file);
 while (p != beg && !IS_ANY_SEP (p[-1])
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':' && p == beg + 2)
 #endif
 ) p--;
 *
 * Value is nonzero if the string output is different from the input.
 */
 static int
-directory_file_name (const char *src, char *dst)
+directory_file_name (CONST char *src, char *dst)
 {
-long slen = strlen (src);
+long slen;
+slen = strlen (src);
 /* Process as Unix format: just remove any final slash.
 But leave "/" unchanged; do not change it to "".  */
 strcpy (dst, src);
+#ifdef APOLLO
+/* Handle // as root for apollo's.  */
+if ((slen > 2 && dst[slen - 1] == '/')
+|| (slen > 1 && dst[0] != '/' && dst[slen - 1] == '/'))
+dst[slen - 1] = 0;
+#else
 if (slen > 1
 && IS_DIRECTORY_SEP (dst[slen - 1])
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 && !IS_ANY_SEP (dst[slen - 2])
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 )
 dst[slen - 1] = 0;
+#endif /* APOLLO */
 return 1;
 }
 DEFUN ("directory-file-name", Fdirectory_file_name, 1, 1, 0, /*
 Return the file name of the directory named DIR.
 arbitrary limit broke generation of Gnus Incoming* files.
 This implementation is better than what one usually finds in libc.
 --hniksic */
-static unsigned int temp_name_rand;
 DEFUN ("make-temp-name", Fmake_temp_name, 1, 1, 0, /*
-Generate a temporary file name starting with PREFIX.
+Generate temporary file name starting with PREFIX.
 The Emacs process number forms part of the result, so there is no
 danger of generating a name being used by another process.
 In addition, this function makes an attempt to choose a name that
 does not specify an existing file.  To make this work, PREFIX should
 be an absolute file name.
 */
 (prefix))
 {
-static const char tbl[64] =
+static char tbl[64] = {
-{
 'A','B','C','D','E','F','G','H',
 'I','J','K','L','M','N','O','P',
 'Q','R','S','T','U','V','W','X',
 'Y','Z','a','b','c','d','e','f',
 'g','h','i','j','k','l','m','n',
 'o','p','q','r','s','t','u','v',
 'w','x','y','z','0','1','2','3',
-'4','5','6','7','8','9','-','_'
+'4','5','6','7','8','9','-','_' };
-};
+static unsigned count, count_initialized_p;
 Lisp_Object val;
 Bytecount len;
 Bufbyte *p, *data;
+unsigned pid;
 CHECK_STRING (prefix);
 /* I was tempted to apply Fexpand_file_name on PREFIX here, but it's
 a bad idea because:
 memcpy (data, XSTRING_DATA (prefix), len);
 p = data + len;
 /* VAL is created by adding 6 characters to PREFIX.  The first three
 are the PID of this process, in base 64, and the second three are
-a pseudo-random number seeded from process startup time.  This
+incremented if the file already exists.  This ensures 262144
-ensures 262144 unique file names per PID per PREFIX per machine.  */
+unique file names per PID per PREFIX.  */
-{
+pid = (unsigned)getpid ();
-unsigned int pid = (unsigned int) getpid ();
+*p++ = tbl[pid & 63], pid >>= 6;
-*p++ = tbl[(pid >>  0) & 63];
+*p++ = tbl[pid & 63], pid >>= 6;
-*p++ = tbl[(pid >>  6) & 63];
+*p++ = tbl[pid & 63], pid >>= 6;
-*p++ = tbl[(pid >> 12) & 63];
-}
 /* Here we try to minimize useless stat'ing when this function is
 invoked many times successively with the same PREFIX.  We achieve
-this by using a very pseudo-random number generator to generate
+this by initializing count to a random value, and incrementing it
-file names unique to this process, with a very long cycle. */
+afterwards.  */
+if (!count_initialized_p)
+{
+count = (unsigned)time (NULL);
+/* Dumping temacs with a non-zero count_initialized_p wouldn't
+make much sense.  */
+if (NILP (Frunning_temacs_p ()))
+	count_initialized_p = 1;
+}
 while (1)
 {
 struct stat ignored;
+unsigned num = count;
-p[0] = tbl[(temp_name_rand >>  0) & 63];
-p[1] = tbl[(temp_name_rand >>  6) & 63];
+p[0] = tbl[num & 63], num >>= 6;
-p[2] = tbl[(temp_name_rand >> 12) & 63];
+p[1] = tbl[num & 63], num >>= 6;
+p[2] = tbl[num & 63], num >>= 6;
 /* Poor man's congruential RN generator.  Replace with ++count
 for debugging.  */
-temp_name_rand += 25229;
+count += 25229;
-temp_name_rand %= 225307;
+count %= 225307;
 QUIT;
-if (stat ((const char *) data, &ignored) < 0)
+if (stat ((CONST char *) data, &ignored) < 0)
 	{
 	  /* We want to return only if errno is ENOENT.  */
 	  if (errno == ENOENT)
 	    return val;
 Bufbyte *nm;
 Bufbyte *newdir, *p, *o;
 int tlen;
 Bufbyte *target;
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 int drive = 0;
 int collapse_newdir = 1;
 #else
 struct passwd *pw;
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 int length;
 Lisp_Object handler;
-#ifdef CYGWIN
+#ifdef __CYGWIN32__
 char *user;
 #endif
 CHECK_STRING (name);
 The EQ test avoids infinite recursion.  */
 if (! NILP (default_directory) && !EQ (default_directory, name)
 /* Save time in some common cases - as long as default_directory
 	 is not relative, it can be canonicalized with name below (if it
 	 is needed at all) without requiring it to be expanded now.  */
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
-/* Detect Windows file names with drive specifiers.  */
+/* Detect MSDOS file names with drive specifiers.  */
 && ! (IS_DRIVE (o[0]) && (IS_DEVICE_SEP (o[1]) && IS_DIRECTORY_SEP (o[2])))
 /* Detect Windows file names in UNC format.  */
 && ! (IS_DIRECTORY_SEP (o[0]) && IS_DIRECTORY_SEP (o[1]))
-#else /* not WIN32_NATIVE */
+#else /* not WINDOWSNT */
 /* Detect Unix absolute file names (/... alone is not absolute on
-	 Windows).  */
+	 DOS or Windows).  */
 && ! (IS_DIRECTORY_SEP (o[0]))
-#endif /* not WIN32_NATIVE */
+#endif /* not WINDOWSNT */
 )
 {
 struct gcpro gcpro1;
 GCPRO1 (name);
 /* #### dmoore - this is ugly, clean this up.  Looks like nm pointing
 into name should be safe during all of this, though. */
 nm = XSTRING_DATA (name);
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 /* 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 ((char *)alloca (strlen ((char *)nm) + 1), (char *)nm);
+nm = strcpy (alloca (strlen (nm) + 1), nm);
 /* Find and remove drive specifier if present; this makes nm absolute
 even if the rest of the name appears to be relative. */
 {
-Bufbyte *colon = (Bufbyte *) strrchr ((char *)nm, ':');
+Bufbyte *colon = strrchr (nm, ':');
 if (colon)
 /* Only recognize colon as part of drive specifier if there is a
 	 single alphabetic character preceding the colon (and if the
 	 character before the drive letter, if present, is a directory
 /* If we see "c://somedir", we want to strip the first slash after the
 colon when stripping the drive letter.  Otherwise, this expands to
 "//somedir".  */
 if (drive && IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1]))
 nm++;
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 /* If nm is absolute, look for /./ or /../ sequences; if none are
 found, we can probably return right away.  We will avoid allocating
 a new string if name is already fully expanded.  */
 if (
 IS_DIRECTORY_SEP (nm[0])
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 && (drive || IS_DIRECTORY_SEP (nm[1]))
 #endif
 )
 {
 /* If it turns out that the filename we want to return is just a
 	    lose = 1;
 	  p++;
 	}
 if (!lose)
 	{
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	  /* Make sure directories are all separated with / or \ as
 	     desired, but avoid allocation of a new string when not
 	     required. */
 	  CORRECT_DIR_SEPS (nm);
 	  if (IS_DIRECTORY_SEP (nm[1]))
 	      name = make_string (nm - 2, p - nm + 2);
 	      XSTRING_DATA (name)[0] = DRIVE_LETTER (drive);
 	      XSTRING_DATA (name)[1] = ':';
 	    }
 	  return name;
-#else /* not WIN32_NATIVE */
+#else /* not WINDOWSNT */
 	  if (nm == XSTRING_DATA (name))
 	    return name;
 	  return build_string ((char *) nm);
-#endif /* not WIN32_NATIVE */
+#endif /* not WINDOWSNT */
 	}
 }
 /* At this point, nm might or might not be an absolute file name.  We
 need to expand ~ or ~user if present, otherwise prefix nm with
 if (nm[0] == '~')		/* prefix ~ */
 {
 if (IS_DIRECTORY_SEP (nm[1])
 	  || nm[1] == 0)	/* ~ by itself */
 	{
-	  Extbyte *newdir_external = get_home_directory ();
+	  char * newdir_external = get_home_directory ();
 	  if (newdir_external == NULL)
 	    newdir = (Bufbyte *) "";
 	  else
-	    TO_INTERNAL_FORMAT (C_STRING, newdir_external,
+	    GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (newdir_external, newdir);
-				C_STRING_ALLOCA, (* ((char **) &newdir)),
-				Qfile_name);
 	  nm++;
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	  collapse_newdir = 0;
 #endif
 	}
 else			/* ~user/filename */
 	{
 	     names the user who runs this instance of XEmacs.  While
 	     NT is single-user (for the moment) you still can have
 	     multiple user profiles users defined, each with its HOME.
 	     Therefore, the following should be reworked to handle
 	     this case.  */
-#ifdef  WIN32_NATIVE
+#ifdef  WINDOWSNT
 	  /* Now if the file given is "~foo/file" and HOME="c:/", then
 	     we want the file to be named "c:/file" ("~foo" becomes
 	     "c:/").  The variable o has "~foo", so we can use the
 	     length of that string to offset nm.  August Hill, 31 Aug
 	     1998.  */
 	  newdir = (Bufbyte *) get_home_directory();
 	  dostounix_filename (newdir);
 	  nm += strlen(o) + 1;
-#else  /* not WIN32_NATIVE */
+#else  /* not WINDOWSNT */
-#ifdef CYGWIN
+#ifdef __CYGWIN32__
 	  if ((user = user_login_name (NULL)) != NULL)
 	    {
 	      /* Does the user login name match the ~name? */
-	      if (strcmp (user, (char *) o + 1) == 0)
+	      if (strcmp(user,((char *) o + 1)) == 0)
 	        {
-		  newdir = (Bufbyte *) get_home_directory();
+		  newdir = (Bufbyte *)  get_home_directory();
 	          nm = p;
 		}
 	    }
 if (! newdir)
 {
-#endif /* CYGWIN */
+#endif /* __CYGWIN32__ */
 	  /* Jamie reports that getpwnam() can get wedged by SIGIO/SIGALARM
 	     occurring in it. (It can call select()). */
 	  slow_down_interrupts ();
 	  pw = (struct passwd *) getpwnam ((char *) o + 1);
 	  speed_up_interrupts ();
 	  if (pw)
 	    {
 	      newdir = (Bufbyte *) pw -> pw_dir;
 	      nm = p;
 	    }
-#ifdef CYGWIN
+#ifdef __CYGWIN32__
 	    }
 #endif
-#endif /* not WIN32_NATIVE */
+#endif /* not WINDOWSNT */
 	  /* If we don't find a user of that name, leave the name
 	     unchanged; don't move nm forward to p.  */
 	}
 }
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 /* On DOS and Windows, nm is absolute if a drive name was specified;
 use the drive's current directory as the prefix if needed.  */
 if (!newdir && drive)
 {
 /* Get default directory if needed to make nm absolute. */
 if (!IS_DIRECTORY_SEP (nm[0]))
 	{
 	  newdir = alloca (MAXPATHLEN + 1);
-	  if (!_getdcwd (toupper (drive) - 'A' + 1, newdir, MAXPATHLEN))
+	  if (!getdefdir (toupper (drive) - 'A' + 1, newdir))
 	    newdir = NULL;
 	}
 if (!newdir)
 	{
 	  /* Either nm starts with /, or drive isn't mounted. */
 	  newdir[1] = ':';
 	  newdir[2] = '/';
 	  newdir[3] = 0;
 	}
 }
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 /* Finally, if no prefix has been specified and nm is not absolute,
 then it must be expanded relative to default_directory. */
 if (1
-#ifndef WIN32_NATIVE
+#ifndef WINDOWSNT
 /* /... alone is not absolute on DOS and Windows. */
 && !IS_DIRECTORY_SEP (nm[0])
 #else
 && !(IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1]))
 #endif
 && !newdir)
 {
 newdir = XSTRING_DATA (default_directory);
 }
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 if (newdir)
 {
 /* First ensure newdir is an absolute name. */
 if (
-	  /* Detect Windows file names with drive specifiers.  */
+	  /* Detect MSDOS file names with drive specifiers.  */
 	  ! (IS_DRIVE (newdir[0])
 	     && IS_DEVICE_SEP (newdir[1]) && IS_DIRECTORY_SEP (newdir[2]))
 	  /* Detect Windows file names in UNC format.  */
 	  && ! (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1]))
 	  /* Detect drive spec by itself */
 	      nm = tmp;
 	    }
 	  newdir = alloca (MAXPATHLEN + 1);
 	  if (drive)
 	    {
-	      if (!_getdcwd (toupper (drive) - 'A' + 1, newdir, MAXPATHLEN))
+	      if (!getdefdir (toupper (drive) - 'A' + 1, newdir))
 		newdir = "/";
 	    }
 	  else
 	    getwd (newdir);
 	}
 	    }
 	  else
 	    newdir = "";
 	}
 }
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 if (newdir)
 {
 /* Get rid of any slash at the end of newdir, unless newdir is
 	 just // (an incomplete UNC name).  */
 length = strlen ((char *) newdir);
 if (length > 1 && IS_DIRECTORY_SEP (newdir[length - 1])
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	  && !(length == 2 && IS_DIRECTORY_SEP (newdir[0]))
 #endif
 	  )
 	{
 	  Bufbyte *temp = (Bufbyte *) alloca (length);
 else
 tlen = 0;
 /* Now concatenate the directory and name to new space in the stack frame */
 tlen += strlen ((char *) nm) + 1;
-#ifdef WIN32_NATIVE
+#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;
-#else  /* not WIN32_NATIVE */
+#else  /* not WINDOWSNT */
 target = (Bufbyte *) alloca (tlen);
-#endif /* not WIN32_NATIVE */
+#endif /* not WINDOWSNT */
 *target = 0;
 if (newdir)
 {
 if (nm[0] == 0 || IS_DIRECTORY_SEP (nm[0]))
 	  /* Keep initial / only if this is the whole name.  */
 	  if (o == target && IS_ANY_SEP (*o) && p[3] == 0)
 	    ++o;
 	  p += 3;
 	}
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 /* if drive is set, we're not dealing with an UNC, so
 	 multiple dir-seps are redundant (and reportedly cause trouble
 	 under win95) */
 else if (drive && IS_DIRECTORY_SEP (p[0]) && IS_DIRECTORY_SEP (p[1]))
 	  ++p;
 	{
 	  *o++ = *p++;
 	}
 }
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 /* At last, set drive name, except for network file name.  */
 if (drive)
 {
 target -= 2;
 target[0] = DRIVE_LETTER (drive);
 else
 {
 assert (IS_DIRECTORY_SEP (target[0]) && IS_DIRECTORY_SEP (target[1]));
 }
 CORRECT_DIR_SEPS (target);
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 return make_string (target, o - target);
 }
+#if 0 /* FSFmacs */
+/* 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
 (does not start with slash); if DEFAULT is nil or missing,
 No component of the resulting pathname will be a symbolic link, as
 in the realpath() function.
 */
 (filename, default_))
 {
-/* This function can GC. */
+/* This function can GC.  GC checked 1997.04.06. */
 Lisp_Object expanded_name;
+Lisp_Object handler;
 struct gcpro gcpro1;
 CHECK_STRING (filename);
 expanded_name = Fexpand_file_name (filename, default_);
-GCPRO1 (expanded_name);
 if (!STRINGP (expanded_name))
 return Qnil;
-{
+GCPRO1 (expanded_name);
-Lisp_Object handler =
+handler = Ffind_file_name_handler (expanded_name, Qfile_truename);
-Ffind_file_name_handler (expanded_name, Qfile_truename);
+UNGCPRO;
 if (!NILP (handler))
-RETURN_UNGCPRO
+return call2_check_string (handler, Qfile_truename, expanded_name);
-	(call2_check_string (handler, Qfile_truename, expanded_name));
-}
 {
 char resolved_path[MAXPATHLEN];
-Extbyte *path;
+char path[MAXPATHLEN];
-Extbyte *p;
+char *p = path;
-Extcount elen;
+int elen = XSTRING_LENGTH (expanded_name);
-TO_EXTERNAL_FORMAT (LISP_STRING, expanded_name,
+if (elen >= countof (path))
-			ALLOCA, (path, elen),
-			Qfile_name);
-p = path;
-if (elen > MAXPATHLEN)
 goto toolong;
+memcpy (path, XSTRING_DATA (expanded_name), elen + 1);
+/* memset (resolved_path, 0, sizeof (resolved_path)); */
 /* Try doing it all at once. */
-/* !! Does realpath() Mule-encapsulate?
+/* !!#### Does realpath() Mule-encapsulate? */
-Answer: Nope! So we do it above */
+if (!xrealpath (path, resolved_path))
-if (!xrealpath ((char *) path, resolved_path))
 {
 	/* Didn't resolve it -- have to do it one component at a time. */
 	/* "realpath" is a typically useless, stupid un*x piece of crap.
 	   It claims to return a useful value in the "error" case, but since
 	   there is no indication provided of how far along the pathname
 	   the function went before erring, there is no way to use the
-	   partial result returned.  What a piece of junk.
+	   partial result returned.  What a piece of junk. */
-	   The above comment refers to historical versions of
-	   realpath().  The Unix98 specs state:
-	   "On successful completion, realpath() returns a
-	   pointer to the resolved name. Otherwise, realpath()
-	   returns a null pointer and sets errno to indicate the
-	   error, and the contents of the buffer pointed to by
-	   resolved_name are undefined."
-	   Since we depend on undocumented semantics of various system realpath()s,
-	   we just use our own version in realpath.c. */
 	for (;;)
 	  {
-	    p = (Extbyte *) memchr (p + 1, '/', elen - (p + 1 - path));
+	    p = (char *) memchr (p + 1, '/', elen - (p + 1 - path));
 	    if (p)
 	      *p = 0;
-	    if (xrealpath ((char *) path, resolved_path))
+	    /* memset (resolved_path, 0, sizeof (resolved_path)); */
+	    if (xrealpath (path, resolved_path))
 	      {
 		if (p)
 		  *p = '/';
 		else
 		  break;
 		int rlen = strlen (resolved_path);
 		/* "On failure, it returns NULL, sets errno to indicate
 		   the error, and places in resolved_path the absolute pathname
 		   of the path component which could not be resolved." */
+		if (p)
-		if (p)
 		  {
 		    int plen = elen - (p - path);
 		    if (rlen > 1 && resolved_path[rlen - 1] == '/')
 		      rlen = rlen - 1;
 	      goto lose;
 	  }
 }
 {
-Lisp_Object resolved_name;
 int rlen = strlen (resolved_path);
 if (elen > 0 && XSTRING_BYTE (expanded_name, elen - 1) == '/'
 && !(rlen > 0 && resolved_path[rlen - 1] == '/'))
 	{
 	  if (rlen + 1 > countof (resolved_path))
 	    goto toolong;
-	  resolved_path[rlen++] = '/';
+	  resolved_path[rlen] = '/';
-	  resolved_path[rlen] = '\0';
+	  resolved_path[rlen + 1] = 0;
+	  rlen = rlen + 1;
 	}
-TO_INTERNAL_FORMAT (DATA, (resolved_path, rlen),
+return make_ext_string ((Bufbyte *) resolved_path, rlen, FORMAT_BINARY);
-			  LISP_STRING, resolved_name,
-			  Qfile_name);
-RETURN_UNGCPRO (resolved_name);
 }
 toolong:
 errno = ENAMETOOLONG;
 goto lose;
 lose:
 report_file_error ("Finding truename", list1 (expanded_name));
 }
-RETURN_UNGCPRO (Qnil);
+return Qnil;	/* suppress compiler warning */
 }
 DEFUN ("substitute-in-file-name", Fsubstitute_in_file_name, 1, 1, 0, /*
 Substitute environment variables referred to in FILENAME.
 /* If /~ or // appears, discard everything through first slash. */
 for (p = nm; p != endp; p++)
 {
 if ((p[0] == '~'
-#if defined (WIN32_NATIVE) || defined (CYGWIN)
+#if defined (APOLLO) || defined (WINDOWSNT) || defined (__CYGWIN32__)
-	   /* // at start of file name is meaningful in WindowsNT systems */
+	   /* // at start of file name is meaningful in Apollo and
+	      WindowsNT systems */
 	   || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)
-#else /* not (WIN32_NATIVE || CYGWIN) */
+#else /* not (APOLLO || WINDOWSNT || __CYGWIN32__) */
 	   || IS_DIRECTORY_SEP (p[0])
-#endif /* not (WIN32_NATIVE || CYGWIN) */
+#endif /* not (APOLLO || WINDOWSNT || __CYGWIN32__) */
 	   )
 	  && p != nm
 	  && (IS_DIRECTORY_SEP (p[-1])))
 	{
 	  nm = p;
 	  substituted = 1;
 	}
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 /* see comment in expand-file-name about drive specifiers */
 else if (IS_DRIVE (p[0]) && p[1] == ':'
 	       && p > nm && IS_DIRECTORY_SEP (p[-1]))
 	{
 	  nm = p;
 	  substituted = 1;
 	}
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 }
 /* See if any variables are substituted into the string
 and find the total length of their values in `total' */
 	/* Copy out the variable name */
 	target = (Bufbyte *) alloca (s - o + 1);
 	strncpy ((char *) target, (char *) o, s - o);
 	target[s - o] = 0;
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	strupr (target); /* $home == $HOME etc.  */
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 	/* Get variable value */
 	o = (Bufbyte *) egetenv ((char *) target);
 	if (!o) goto badvar;
 	total += strlen ((char *) o);
 	/* Copy out the variable name */
 	target = (Bufbyte *) alloca (s - o + 1);
 	strncpy ((char *) target, (char *) o, s - o);
 	target[s - o] = 0;
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	strupr (target); /* $home == $HOME etc.  */
-#endif /* WIN32_NATIVE */
+#endif /* WINDOWSNT */
 	/* Get variable value */
 	o = (Bufbyte *) egetenv ((char *) target);
 	if (!o)
 	  goto badvar;
 /* If /~ or // appears, discard everything through first slash. */
 for (p = xnm; p != x; p++)
 if ((p[0] == '~'
-#if defined (WIN32_NATIVE)
+#if defined (APOLLO) || defined (WINDOWSNT)
 	 || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)
-#else /* not WIN32_NATIVE */
+#else /* not (APOLLO || WINDOWSNT) */
 	 || IS_DIRECTORY_SEP (p[0])
-#endif /* not WIN32_NATIVE */
+#endif /* APOLLO || WINDOWSNT */
 	 )
 	/* don't do p[-1] if that would go off the beginning --jwz */
 	&& p != nm && p > xnm && IS_DIRECTORY_SEP (p[-1]))
 xnm = p;
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 else if (IS_DRIVE (p[0]) && p[1] == ':'
 	     && p > nm && IS_DIRECTORY_SEP (p[-1]))
 	xnm = p;
 #endif
 to alter the file.
 *STATPTR is used to store the stat information if the file exists.
 If the file does not exist, STATPTR->st_mode is set to 0.  */
 static void
-barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
+barf_or_query_if_file_exists (Lisp_Object absname, CONST char *querystring,
 			      int interactive, struct stat *statptr)
 {
 /* This function can GC.  GC checked 1997.04.06. */
 struct stat statbuf;
 	{
 	  Lisp_Object prompt;
 	  struct gcpro gcpro1;
 	  prompt = emacs_doprnt_string_c
-	    ((const Bufbyte *) GETTEXT ("File %s already exists; %s anyway? "),
+	    ((CONST Bufbyte *) GETTEXT ("File %s already exists; %s anyway? "),
 	     Qnil, -1, XSTRING_DATA (absname),
 	     GETTEXT (querystring));
 	  GCPRO1 (prompt);
 	  tem = call1 (Qyes_or_no_p, prompt);
 if (NILP (ok_if_already_exists)
 || INTP (ok_if_already_exists))
 barf_or_query_if_file_exists (newname, "copy to it",
 				  INTP (ok_if_already_exists), &out_st);
-else if (stat ((const char *) XSTRING_DATA (newname), &out_st) < 0)
+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 | OPEN_BINARY, 0);
 if (ifd < 0)
 report_file_error ("Opening input file", list1 (filename));
 /* We can only copy regular files and symbolic links.  Other files are not
 copyable by us. */
 input_file_statable_p = (fstat (ifd, &st) >= 0);
-#ifndef WIN32_NATIVE
+#ifndef WINDOWSNT
 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",
 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", list1 (newname));
 }
-chmod ((const char *) XSTRING_DATA (newname),
+chmod ((CONST char *) XSTRING_DATA (newname),
 	     st.st_mode & 07777);
 }
 /* We'll close it by hand */
 XCAR (ofd_locative) = Qnil;
 if (XSTRING_LENGTH (dirname_) > (Bytecount) (sizeof (dir) - 1))
 {
 return Fsignal (Qfile_error,
 		      list3 (build_translated_string ("Creating directory"),
-			     build_translated_string ("pathname too long"),
+			     build_translated_string ("pathame too long"),
 			     dirname_));
 }
 strncpy (dir, (char *) XSTRING_DATA (dirname_),
 	   XSTRING_LENGTH (dirname_) + 1);
 return Qnil;
 }
 DEFUN ("delete-file", Fdelete_file, 1, 1, "fDelete file: ", /*
-Delete the file named FILENAME (a string).
+Delete specified file.  One argument, a file name string.
-If FILENAME has multiple names, it continues to exist with the other names.
+If file has multiple names, it continues to exist with the other names.
 */
 (filename))
 {
 /* This function can GC.  GC checked 1997.04.06. */
 Lisp_Object handler;
 || INTP (ok_if_already_exists))
 barf_or_query_if_file_exists (newname, "rename to it",
 				  INTP (ok_if_already_exists), 0);
 /* Syncing with FSF 19.34.6 note: FSF does not have conditional code for
-WIN32_NATIVE here; I've removed it.  --marcpa */
+WINDOWSNT here; I've removed it.  --marcpa */
-/* We have configure check for rename() and emulate using
+/* FSFmacs only calls rename() here under BSD 4.1, and calls
-link()/unlink() if necessary. */
+link() and unlink() otherwise, but that's bogus.  Sometimes
+rename() succeeds where link()/unlink() fail, and we have
+configure check for rename() and emulate using link()/unlink()
+if necessary. */
 if (0 > rename ((char *) XSTRING_DATA (filename),
 		  (char *) XSTRING_DATA (newname)))
 {
 if (errno == EXDEV)
 	{
 	  Fcopy_file (filename, newname,
 		      /* We have already prompted if it was an integer,
 			 so don't have copy-file prompt again.  */
-		      (NILP (ok_if_already_exists) ? Qnil : Qt),
+		      ((NILP (ok_if_already_exists)) ? Qnil : Qt),
 Qt);
 	  Fdelete_file (filename);
 	}
 else
 	{
 /* Syncing with FSF 19.34.6 note: FSF does not report a file error
 on NT here. --marcpa */
 /* But FSF #defines link as sys_link which is supplied in nt.c. We can't do
 that because sysfile.h defines sys_link depending on ENCAPSULATE_LINK.
 Reverted to previous behavior pending a working fix. (jhar) */
-#if defined(WIN32_NATIVE)
+#if defined(WINDOWSNT)
 /* Windows does not support this operation.  */
 report_file_error ("Adding new name", Flist (2, &filename));
-#else /* not defined(WIN32_NATIVE) */
+#else /* not defined(WINDOWSNT) */
 unlink ((char *) XSTRING_DATA (newname));
 if (0 > link ((char *) XSTRING_DATA (filename),
 		(char *) XSTRING_DATA (newname)))
 {
 report_file_error ("Adding new name",
 			 list2 (filename, newname));
 }
-#endif /* defined(WIN32_NATIVE) */
+#endif /* defined(WINDOWSNT) */
 UNGCPRO;
 return Qnil;
 }
+#ifdef S_IFLNK
 DEFUN ("make-symbolic-link", Fmake_symbolic_link, 2, 3,
 "FMake symbolic link to file: \nFMake symbolic link to file %s: \np", /*
 Make a symbolic link to FILENAME, named LINKNAME.  Both args strings.
 Signals a `file-already-exists' error if a file LINKNAME already exists
 unless optional third argument OK-IF-ALREADY-EXISTS is non-nil.
 This happens for interactive use with M-x.
 */
 (filename, linkname, ok_if_already_exists))
 {
 /* This function can GC.  GC checked 1997.06.04. */
-/* XEmacs change: run handlers even if local machine doesn't have symlinks */
 Lisp_Object handler;
 struct gcpro gcpro1, gcpro2;
 GCPRO2 (filename, linkname);
 CHECK_STRING (filename);
 handler = Ffind_file_name_handler (linkname, Qmake_symbolic_link);
 if (!NILP (handler))
 RETURN_UNGCPRO (call4 (handler, Qmake_symbolic_link, filename,
 			   linkname, ok_if_already_exists));
-#ifdef S_IFLNK
 if (NILP (ok_if_already_exists)
 || INTP (ok_if_already_exists))
 barf_or_query_if_file_exists (linkname, "make it a link",
 				  INTP (ok_if_already_exists), 0);
 		   (char *) XSTRING_DATA (linkname)))
 {
 report_file_error ("Making symbolic link",
 			 list2 (filename, linkname));
 }
-#endif /* S_IFLNK */
 UNGCPRO;
 return Qnil;
 }
+#endif /* S_IFLNK */
 #ifdef HPUX_NET
 DEFUN ("sysnetunam", Fsysnetunam, 2, 2, 0, /*
 Open a network connection to PATH using LOGIN as the login string.
 */
 (path, login))
 {
 int netresult;
-const char *path_ext;
-const char *login_ext;
 CHECK_STRING (path);
 CHECK_STRING (login);
 /* netunam, being a strange-o system call only used once, is not
 encapsulated. */
+{
-TO_EXTERNAL_FORMAT (LISP_STRING, path,  C_STRING_ALLOCA, path_ext,  Qfile_name);
+char *path_ext;
-TO_EXTERNAL_FORMAT (LISP_STRING, login, C_STRING_ALLOCA, login_ext, Qnative);
+char *login_ext;
-netresult = netunam (path_ext, login_ext);
+GET_C_STRING_FILENAME_DATA_ALLOCA (path, path_ext);
+GET_C_STRING_EXT_DATA_ALLOCA (login, FORMAT_OS, login_ext);
-return netresult == -1 ? Qnil : Qt;
+netresult = netunam (path_ext, login_ext);
+}
+if (netresult == -1)
+return Qnil;
+else
+return Qt;
 }
 #endif /* HPUX_NET */
 DEFUN ("file-name-absolute-p", Ffile_name_absolute_p, 1, 1, 0, /*
 Return t if file FILENAME specifies an absolute path name.
 Bufbyte *ptr;
 CHECK_STRING (filename);
 ptr = XSTRING_DATA (filename);
 return (IS_DIRECTORY_SEP (*ptr) || *ptr == '~'
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 	  || (IS_DRIVE (*ptr) && ptr[1] == ':' && IS_DIRECTORY_SEP (ptr[2]))
 #endif
 	  ) ? Qt : Qnil;
 }
 /* Return nonzero if file FILENAME exists and can be executed.  */
 static int
 check_executable (char *filename)
 {
-#ifdef WIN32_NATIVE
+#ifdef WINDOWSNT
 struct stat st;
 if (stat (filename, &st) < 0)
 return 0;
 return ((st.st_mode & S_IEXEC) != 0);
-#else /* not WIN32_NATIVE */
+#else /* not WINDOWSNT */
 #ifdef HAVE_EACCESS
 return eaccess (filename, 1) >= 0;
 #else
 /* Access isn't quite right because it uses the real uid
 and we really want to test with the effective uid.
 But Unix doesn't give us a right way to do it.  */
 return access (filename, 1) >= 0;
 #endif /* HAVE_EACCESS */
-#endif /* not WIN32_NATIVE */
+#endif /* not WINDOWSNT */
 }
 /* Return nonzero if file FILENAME exists and can be written.  */
 static int
-check_writable (const char *filename)
+check_writable (CONST char *filename)
 {
 #ifdef HAVE_EACCESS
 return (eaccess (filename, 2) >= 0);
 #else
 /* Access isn't quite right because it uses the real uid
 call the corresponding file handler.  */
 handler = Ffind_file_name_handler (abspath, Qfile_readable_p);
 if (!NILP (handler))
 RETURN_UNGCPRO (call2 (handler, Qfile_readable_p, abspath));
-#if defined(WIN32_NATIVE) || defined(CYGWIN)
+#if defined(WINDOWSNT) || defined(__CYGWIN32__)
 /* Under MS-DOS and Windows, open does not work for directories.  */
 UNGCPRO;
 if (access (XSTRING_DATA (abspath), 0) == 0)
 return Qt;
 else
 return Qnil;
-#else /* not WIN32_NATIVE */
+#else /* not WINDOWSNT */
 {
 int desc = interruptible_open ((char *) XSTRING_DATA (abspath), O_RDONLY | OPEN_BINARY, 0);
 UNGCPRO;
 if (desc < 0)
 return Qnil;
 close (desc);
 return Qt;
 }
-#endif /* not WIN32_NATIVE */
+#endif /* not WINDOWSNT */
 }
 /* Having this before file-symlink-p mysteriously caused it to be forgotten
 on the RT/PC.  */
 DEFUN ("file-writable-p", Ffile_writable_p, 1, 1, 0, /*
 Otherwise returns nil.
 */
 (filename))
 {
 /* This function can GC.  GC checked 1997.04.10. */
-/* XEmacs change: run handlers even if local machine doesn't have symlinks */
 #ifdef S_IFLNK
 char *buf;
 int bufsize;
 int valsize;
 Lisp_Object val;
-#endif
 Lisp_Object handler;
 struct gcpro gcpro1;
 CHECK_STRING (filename);
 filename = Fexpand_file_name (filename, Qnil);
 handler = Ffind_file_name_handler (filename, Qfile_symlink_p);
 UNGCPRO;
 if (!NILP (handler))
 return call2 (handler, Qfile_symlink_p, filename);
-#ifdef S_IFLNK
 bufsize = 100;
 while (1)
 {
 buf = xnew_array_and_zero (char, bufsize);
 valsize = readlink ((char *) XSTRING_DATA (filename),
 handler = Ffind_file_name_handler (filename, Qfile_accessible_directory_p);
 if (!NILP (handler))
 return call2 (handler, Qfile_accessible_directory_p,
 		  filename);
-#if !defined(WIN32_NATIVE)
+#if !defined(WINDOWSNT)
 if (NILP (Ffile_directory_p (filename)))
 return (Qnil);
 else
 return Ffile_executable_p (filename);
 #else
 tem = (NILP (Ffile_directory_p (filename))
 	   || NILP (Ffile_executable_p (filename)));
 UNGCPRO;
 return tem ? Qnil : Qt;
 }
-#endif /* !defined(WIN32_NATIVE) */
+#endif /* !defined(WINDOWSNT) */
 }
 DEFUN ("file-regular-p", Ffile_regular_p, 1, 1, 0, /*
 Return t if file FILENAME is the name of a regular file.
 This is the sort of file that holds an ordinary stream of data bytes.
 if (stat ((char *) XSTRING_DATA (abspath), &st) < 0)
 return Qnil;
 /* Syncing with FSF 19.34.6 note: not in FSF, #if 0'ed out here. */
 #if 0
-#ifdef WIN32_NATIVE
+#ifdef DOS_NT
 if (check_executable (XSTRING_DATA (abspath)))
 st.st_mode |= S_IEXEC;
-#endif /* WIN32_NATIVE */
+#endif /* DOS_NT */
 #endif /* 0 */
 return make_int (st.st_mode & 07777);
 }
 DEFUN ("unix-sync", Funix_sync, 0, 0, "", /*
 Tell Unix to finish all pending disk updates.
 */
 ())
 {
-#ifndef WIN32_NATIVE
+#ifndef WINDOWSNT
 sync ();
 #endif
 return Qnil;
 }
 if ( (!NILP (beg) || !NILP (end)) && !NILP (visit) )
 error ("Attempt to visit less than an entire file");
 fd = -1;
-if (stat ((char *) XSTRING_DATA (filename), &st) < 0)
+if (
+#ifndef APOLLO
+(stat ((char *) XSTRING_DATA (filename), &st) < 0)
+#else /* APOLLO */
+/* Don't even bother with interruptible_open.  APOLLO sucks. */
+((fd = open ((char *) XSTRING_DATA (filename), O_RDONLY | OPEN_BINARY, 0)) < 0
+|| fstat (fd, &st) < 0)
+#endif /* APOLLO */
+)
 {
 if (fd >= 0) close (fd);
 badopen:
 if (NILP (visit))
 	report_file_error ("Opening input file", list1 (filename));
 /* No need to limit the amount of stuff we attempt to read. (It would
 be incorrect, anyway, when Mule is enabled.) Instead, the limiting
 occurs inside of the filedesc stream. */
 while (1)
 {
-	ssize_t this_len;
+	Bytecount this_len;
 	Charcount cc_inserted;
 	QUIT;
 	this_len = Lstream_read (XLSTREAM (stream), read_buf,
 				 sizeof (read_buf));
 if (!NILP (visit))
 {
 if (!EQ (buf->undo_list, Qt))
 	buf->undo_list = Qnil;
+#ifdef APOLLO
+stat ((char *) XSTRING_DATA (filename), &st);
+#endif
 if (NILP (handler))
 	{
 	  buf->modtime = st.st_mtime;
 	  buf->filename = filename;
 	  /* XEmacs addition: */
 desc = open ((char *) XSTRING_DATA (fn), O_WRONLY | OPEN_BINARY, 0);
 }
 if (desc < 0)
 {
 desc = open ((char *) XSTRING_DATA (fn),
-O_WRONLY | O_TRUNC | O_CREAT | OPEN_BINARY,
+(O_WRONLY | O_TRUNC | O_CREAT | OPEN_BINARY),
-		   auto_saving ? auto_save_mode_bits : CREAT_MODE);
+		   ((auto_saving) ? auto_save_mode_bits : CREAT_MODE));
 }
 if (desc < 0)
 {
 #ifdef CLASH_DETECTION
 	failure = 1;
 	save_errno = errno;
 }
 #endif /* HAVE_FSYNC */
-/* Spurious "file has changed on disk" warnings used to be seen on
+/* Spurious "file has changed on disk" warnings have been
-systems where close() can change the modtime.  This is known to
+observed on Suns as well.
-happen on various NFS file systems, on Windows, and on Linux.
+It seems that `close' can change the modtime, under nfs.
-Rather than handling this on a per-system basis, we
-unconditionally do the stat() after the close(). */
+(This has supposedly been fixed in Sunos 4,
+but who knows about all the other machines with NFS?)  */
+/* On VMS and APOLLO, must do the stat after the close
+since closing changes the modtime.  */
+/* As it does on Windows too - kkm */
+/* The spurious warnings appear on Linux too.  Rather than handling
+this on a per-system basis, unconditionally do the stat after the close - cgw */
+#if 0 /* !defined (WINDOWSNT) */  /* !defined (VMS) && !defined (APOLLO) */
+fstat (desc, &st);
+#endif
 /* NFS can report a write failure now.  */
 if (close (desc) < 0)
 {
 	failure = 1;
 as necessary). */
 XCAR (desc_locative) = Qnil;
 unbind_to (speccount, Qnil);
 }
+/* # if defined (WINDOWSNT) */ /* defined (VMS) || defined (APOLLO) */
 stat ((char *) XSTRING_DATA (fn), &st);
+/* #endif */
 #ifdef CLASH_DETECTION
 if (!auto_saving)
 unlock_file (lockname);
 #endif /* CLASH_DETECTION */
 if (minibuf_level != 0 || preparing_for_armageddon)
 no_message = Qt;
 run_hook (Qauto_save_hook);
-if (STRINGP (Vauto_save_list_file_name))
+if (GC_STRINGP (Vauto_save_list_file_name))
 listfile = condition_case_1 (Qt,
 				 auto_save_expand_name,
 				 Vauto_save_list_file_name,
 				 auto_save_expand_name_error, Qnil);
 autosave perfectly ordinary files because it couldn't handle some
 ange-ftp'd file.  */
 for (do_handled_files = 0; do_handled_files < 2; do_handled_files++)
 {
 for (tail = Vbuffer_alist;
-	   CONSP (tail);
+	   GC_CONSP (tail);
 	   tail = XCDR (tail))
 	{
 	  buf = XCDR (XCAR (tail));
 	  b = XBUFFER (buf);
-	  if (!NILP (current_only)
+	  if (!GC_NILP (current_only)
 	      && b != current_buffer)
 	    continue;
 	  /* Don't auto-save indirect buffers.
 	     The base buffer takes care of it.  */
 	    continue;
 	  /* Check for auto save enabled
 	     and file changed since last auto save
 	     and file changed since last real save.  */
-	  if (STRINGP (b->auto_save_file_name)
+	  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->saved_size) >= 0
 	      && (do_handled_files
 		  if (!gc_in_progress)
 		    Fsleep_for (make_int (1));
 		  continue;
 		}
 	      set_buffer_internal (b);
-	      if (!auto_saved && NILP (no_message))
+	      if (!auto_saved && GC_NILP (no_message))
 		{
-		  static const unsigned char *msg
+		  static CONST unsigned char *msg
-		    = (const unsigned char *) "Auto-saving...";
+		    = (CONST unsigned char *) "Auto-saving...";
 		  echo_area_message (selected_frame (), msg, Qnil,
-				     0, strlen ((const char *) msg),
+				     0, strlen ((CONST char *) msg),
 				     Qauto_saving);
 		}
 	      /* 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 && GC_STRINGP (listfile) && listdesc < 0)
 		{
 		  listdesc = open ((char *) XSTRING_DATA (listfile),
 				   O_WRONLY | O_TRUNC | O_CREAT | OPEN_BINARY,
 				   CREAT_MODE);
 		 the special file that lists them.  For each of
 		 these buffers, record visited name (if any) and
 		 auto save name.  */
 	      if (listdesc >= 0)
 		{
-		  const Extbyte *auto_save_file_name_ext;
+		  CONST Extbyte *auto_save_file_name_ext;
 		  Extcount auto_save_file_name_ext_len;
-		  TO_EXTERNAL_FORMAT (LISP_STRING, b->auto_save_file_name,
+		  GET_STRING_FILENAME_DATA_ALLOCA
-				      ALLOCA, (auto_save_file_name_ext,
+		    (b->auto_save_file_name,
-					       auto_save_file_name_ext_len),
+		     auto_save_file_name_ext,
-				      Qfile_name);
+		     auto_save_file_name_ext_len);
 		  if (!NILP (b->filename))
 		    {
-		      const Extbyte *filename_ext;
+		      CONST Extbyte *filename_ext;
 		      Extcount filename_ext_len;
-		      TO_EXTERNAL_FORMAT (LISP_STRING, b->filename,
+		      GET_STRING_FILENAME_DATA_ALLOCA (b->filename,
-					  ALLOCA, (filename_ext,
+						       filename_ext,
-						   filename_ext_len),
+						       filename_ext_len);
-					  Qfile_name);
 		      write (listdesc, filename_ext, filename_ext_len);
 		    }
 		  write (listdesc, "\n", 1);
 		  write (listdesc, auto_save_file_name_ext,
 			 auto_save_file_name_ext_len);
 /* If we didn't save anything into the listfile, remove the old
 one because nothing needed to be auto-saved.  Do this afterwards
 rather than before in case we get a crash attempting to autosave
 (in that case we'd still want the old one around). */
-if (listdesc < 0 && !auto_saved && STRINGP (listfile))
+if (listdesc < 0 && !auto_saved && GC_STRINGP (listfile))
 unlink ((char *) XSTRING_DATA (listfile));
 /* Show "...done" only if the echo area would otherwise be empty. */
 if (auto_saved && NILP (no_message)
 && NILP (clear_echo_area (selected_frame (), Qauto_saving, 0)))
 {
-static const unsigned char *msg
+static CONST unsigned char *msg
-= (const unsigned char *)"Auto-saving...done";
+= (CONST unsigned char *)"Auto-saving...done";
 echo_area_message (selected_frame (), msg, Qnil, 0,
-			 strlen ((const char *) msg), Qauto_saving);
+			 strlen ((CONST char *) msg), Qauto_saving);
 }
 Vquit_flag = oquit;
 RETURN_UNGCPRO (unbind_to (speccount, Qnil));
 defsymbol (&Qwrite_region, "write-region");
 defsymbol (&Qverify_visited_file_modtime, "verify-visited-file-modtime");
 defsymbol (&Qset_visited_file_modtime, "set-visited-file-modtime");
 defsymbol (&Qcar_less_than_car, "car-less-than-car"); /* Vomitous! */
+defsymbol (&Qfile_name_handler_alist, "file-name-handler-alist");
 defsymbol (&Qauto_save_hook, "auto-save-hook");
 defsymbol (&Qauto_save_error, "auto-save-error");
 defsymbol (&Qauto_saving, "auto-saving");
 defsymbol (&Qformat_decode, "format-decode");
 DEFSUBR (Fmake_directory_internal);
 DEFSUBR (Fdelete_directory);
 DEFSUBR (Fdelete_file);
 DEFSUBR (Frename_file);
 DEFSUBR (Fadd_name_to_file);
+#ifdef S_IFLNK
 DEFSUBR (Fmake_symbolic_link);
+#endif /* S_IFLNK */
 #ifdef HPUX_NET
 DEFSUBR (Fsysnetunam);
 #endif /* HPUX_NET */
 DEFSUBR (Ffile_name_absolute_p);
 DEFSUBR (Ffile_exists_p);
 The value should be either ?/ or ?\\ (any other value is treated as ?\\).
 This variable affects the built-in functions only on Windows,
 on other platforms, it is initialized so that Lisp code can find out
 what the normal separator is.
 */ );
-#ifdef WIN32_NATIVE
-Vdirectory_sep_char = make_char ('\\');
-#else
 Vdirectory_sep_char = make_char ('/');
-#endif
+}
-reinit_vars_of_fileio ();
-}
-void
-reinit_vars_of_fileio (void)
-{
-/* We want temp_name_rand to be initialized to a value likely to be
-unique to the process, not to the executable.  The danger is that
-two different XEmacs processes using the same binary on different
-machines creating temp files in the same directory will be
-unlucky enough to have the same pid.  If we randomize using
-process startup time, then in practice they will be unlikely to
-collide. We use the microseconds field so that scripts that start
-simultaneous XEmacs processes on multiple machines will have less
-chance of collision.  */
-{
-EMACS_TIME thyme;
-EMACS_GET_TIME (thyme);
-temp_name_rand = (unsigned int) (EMACS_SECS (thyme) ^ EMACS_USECS (thyme));
-}
-}

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 412:697ef44129c6 r21-2-14