xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28

author	cvs
date	Mon, 13 Aug 2007 11:33:38 +0200
parents	3a7e78e1142d
children	abe6d1db359e

comparison

equal deleted inserted replaced

-:357dd071b03c
+:8de8e3f6228a
 #endif /* HPUX_PRE_8_0 */
 #endif /* HPUX */
 #ifdef WINDOWSNT
 #define NOMINMAX 1
-#include <windows.h>
 #include <direct.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #endif /* not WINDOWSNT */
 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), FORMAT_NATIVE);
+return build_ext_string (strerror (errnum), Qnative);
 }
 static Lisp_Object
 close_file_unwind (Lisp_Object fd)
 {
 */
 static int
 directory_file_name (CONST char *src, char *dst)
 {
-long slen;
+long slen = strlen (src);
-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 WINDOWSNT
 && !IS_ANY_SEP (dst[slen - 2])
 #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.
 if (nm[0] == '~')		/* prefix ~ */
 {
 if (IS_DIRECTORY_SEP (nm[1])
 	  || nm[1] == 0)	/* ~ by itself */
 	{
-	  char * newdir_external = get_home_directory ();
+	  Extbyte *newdir_external = get_home_directory ();
 	  if (newdir_external == NULL)
 	    newdir = (Bufbyte *) "";
 	  else
-	    GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (newdir_external, newdir);
+	    TO_INTERNAL_FORMAT (C_STRING, newdir_external,
+				C_STRING_ALLOCA, (* ((char **) &newdir)),
+				Qfile_name);
 	  nm++;
 #ifdef WINDOWSNT
 	  collapse_newdir = 0;
 #endif
 {
 char resolved_path[MAXPATHLEN];
 Extbyte *path;
 Extbyte *p;
-Extcount elen = XSTRING_LENGTH (expanded_name);
+Extcount elen;
-GET_STRING_FILENAME_DATA_ALLOCA (expanded_name,path,elen);
+TO_EXTERNAL_FORMAT (LISP_STRING, expanded_name,
+			ALLOCA, (path, elen),
+			Qfile_name);
 p = path;
 if (elen > MAXPATHLEN)
 goto toolong;
 /* Try doing it all at once. */
 	    goto toolong;
 	  resolved_path[rlen] = '/';
 	  resolved_path[rlen + 1] = 0;
 	  rlen = rlen + 1;
 	}
-return make_ext_string ((Bufbyte *) resolved_path, rlen, FORMAT_BINARY);
+return make_ext_string ((Bufbyte *) resolved_path, rlen, Qbinary);
 }
 toolong:
 errno = ENAMETOOLONG;
 goto lose;
 /* If /~ or // appears, discard everything through first slash. */
 for (p = nm; p != endp; p++)
 {
 if ((p[0] == '~'
-#if defined (APOLLO) || defined (WINDOWSNT) || defined (__CYGWIN32__)
+#if defined (WINDOWSNT) || defined (__CYGWIN32__)
-	   /* // at start of file name is meaningful in Apollo and
+	   /* // at start of file name is meaningful in WindowsNT systems */
-	      WindowsNT systems */
 	   || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm)
-#else /* not (APOLLO || WINDOWSNT || __CYGWIN32__) */
+#else /* not (WINDOWSNT || __CYGWIN32__) */
 	   || IS_DIRECTORY_SEP (p[0])
-#endif /* not (APOLLO || WINDOWSNT || __CYGWIN32__) */
+#endif /* not (WINDOWSNT || __CYGWIN32__) */
 	   )
 	  && p != nm
 	  && (IS_DIRECTORY_SEP (p[-1])))
 	{
 	  nm = p;
 /* If /~ or // appears, discard everything through first slash. */
 for (p = xnm; p != x; p++)
 if ((p[0] == '~'
-#if defined (APOLLO) || defined (WINDOWSNT)
+#if defined (WINDOWSNT)
 	 || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm)
-#else /* not (APOLLO || WINDOWSNT) */
+#else /* not WINDOWSNT */
 	 || IS_DIRECTORY_SEP (p[0])
-#endif /* APOLLO || WINDOWSNT */
+#endif /* not 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 WINDOWSNT
 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. */
-{
-char *path_ext;
+TO_EXTERNAL_FORMAT (LISP_STRING, path,  C_STRING_ALLOCA, path_ext,  Qfile_name);
-char *login_ext;
+TO_EXTERNAL_FORMAT (LISP_STRING, login, C_STRING_ALLOCA, login_ext, Qnative);
-GET_C_STRING_FILENAME_DATA_ALLOCA (path, path_ext);
+netresult = netunam (path_ext, login_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.
 if ( (!NILP (beg) || !NILP (end)) && !NILP (visit) )
 error ("Attempt to visit less than an entire file");
 fd = -1;
-if (
+if (stat ((char *) XSTRING_DATA (filename), &st) < 0)
-#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));
 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: */
 	failure = 1;
 	save_errno = errno;
 }
 #endif /* HAVE_FSYNC */
-/* Spurious "file has changed on disk" warnings have been
+/* Spurious "file has changed on disk" warnings used to be seen on
-observed on Suns as well.
+systems where close() can change the modtime.  This is known to
-It seems that `close' can change the modtime, under nfs.
+happen on various NFS file systems, on Windows, and on Linux.
+Rather than handling this on a per-system basis, we
-(This has supposedly been fixed in Sunos 4,
+unconditionally do the stat() after the close(). */
-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 (listdesc >= 0)
 		{
 		  CONST Extbyte *auto_save_file_name_ext;
 		  Extcount auto_save_file_name_ext_len;
-		  GET_STRING_FILENAME_DATA_ALLOCA
+		  TO_EXTERNAL_FORMAT (LISP_STRING, b->auto_save_file_name,
-		    (b->auto_save_file_name,
+				      ALLOCA, (auto_save_file_name_ext,
-		     auto_save_file_name_ext,
+					       auto_save_file_name_ext_len),
-		     auto_save_file_name_ext_len);
+				      Qfile_name);
 		  if (!NILP (b->filename))
 		    {
 		      CONST Extbyte *filename_ext;
 		      Extcount filename_ext_len;
-		      GET_STRING_FILENAME_DATA_ALLOCA (b->filename,
+		      TO_EXTERNAL_FORMAT (LISP_STRING, b->filename,
-						       filename_ext,
+					  ALLOCA, (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);

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 440:8de8e3f6228a r21-2-28