xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 400:a86b2b5e0111 r21-2-30

Import from CVS: tag r21-2-30

author	cvs
date	Mon, 13 Aug 2007 11:14:34 +0200
parents	74fd4e045ea6
children	2f8bb876ab1d

comparison

equal deleted inserted replaced

-:376370fb5946
+:a86b2b5e0111
 /* 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 = alloca (MAXPATHLEN + 1);
+Bufbyte *res = (Bufbyte*) alloca (MAXPATHLEN + 1);
-if (getdefdir (toupper (*beg) - 'A' + 1, res))
+if (getdefdir (toupper (*beg) - 'A' + 1, (char *)res))
 	{
 	  char *c=((char *) res) + strlen ((char *) res);
 	  if (!IS_DIRECTORY_SEP (*c))
 	    {
 	      *c++ = DIRECTORY_SEP;
 nm = XSTRING_DATA (name);
 #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 (alloca (strlen (nm) + 1), nm);
+nm = strcpy ((char *)alloca (strlen ((char *)nm) + 1), (char *)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 = strrchr (nm, ':');
+Bufbyte *colon = (Bufbyte *) strrchr ((char *)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
 #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,
 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_))
 {
-/* This function can GC.  GC checked 1997.04.06. */
+/* This function can GC. */
 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);
+{
-handler = Ffind_file_name_handler (expanded_name, Qfile_truename);
+Lisp_Object handler =
-UNGCPRO;
+Ffind_file_name_handler (expanded_name, Qfile_truename);
 if (!NILP (handler))
-return call2_check_string (handler, Qfile_truename, expanded_name);
+RETURN_UNGCPRO
+	(call2_check_string (handler, Qfile_truename, expanded_name));
+}
 {
 char resolved_path[MAXPATHLEN];
 Extbyte *path;
 Extbyte *p;
 			ALLOCA, (path, elen),
 			Qfile_name);
 p = path;
 if (elen > MAXPATHLEN)
 goto toolong;
 /* Try doing it all at once. */
 /* !! Does realpath() Mule-encapsulate?
 Answer: Nope! So we do it above */
 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));
 	    if (p)
 	      *p = 0;
-	    /* memset (resolved_path, 0, sizeof (resolved_path)); */
 	    if (xrealpath ((char *) path, resolved_path))
 	      {
 		if (p)
 		  *p = '/';
 		else
 		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 + 1] = 0;
+	  resolved_path[rlen] = '\0';
-	  rlen = rlen + 1;
 	}
-return make_ext_string ((Bufbyte *) resolved_path, rlen, Qbinary);
+TO_INTERNAL_FORMAT (DATA, (resolved_path, rlen),
+			  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 Qnil;	/* suppress compiler warning */
+RETURN_UNGCPRO (Qnil);
 }
 DEFUN ("substitute-in-file-name", Fsubstitute_in_file_name, 1, 1, 0, /*
 Substitute environment variables referred to in FILENAME.
 return Qnil;
 }
 DEFUN ("delete-file", Fdelete_file, 1, 1, "fDelete file: ", /*
-Delete specified file.  One argument, a file name string.
+Delete the file named FILENAME (a string).
-If file has multiple names, it continues to exist with the other names.
+If FILENAME has multiple names, it continues to exist with the other names.
 */
 (filename))
 {
 /* This function can GC.  GC checked 1997.04.06. */
 Lisp_Object handler;
 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

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 400:a86b2b5e0111 r21-2-30