xemacs-beta: src/fileio.c comparison

comparison src/fileio.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	d883f39b8495
children	4af0ddfb7c5b

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 beg = XSTRING_DATA (file);
 p = beg + XSTRING_LENGTH (file);
 while (p != beg && !IS_ANY_SEP (p[-1])
 #ifdef WINDOWSNT
-	 /* only recognise drive specifier at beginning */
+	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':' && p == beg + 2)
 #endif
 ) p--;
 if (p == beg)
 beg = XSTRING_DATA (file);
 end = p = beg + XSTRING_LENGTH (file);
 while (p != beg && !IS_ANY_SEP (p[-1])
 #ifdef WINDOWSNT
-	 /* only recognise drive specifier at beginning */
+	 /* only recognize drive specifier at beginning */
 	 && !(p[-1] == ':' && p == beg + 2)
 #endif
 ) p--;
 return make_string (p, end - p);
 if (stat ((CONST char *) data, &ignored) < 0)
 	{
 	  /* We want to return only if errno is ENOENT.  */
 	  if (errno == ENOENT)
 	    return val;
-	  else
-	    /* The error here is dubious, but there is little else we
+	  /* The error here is dubious, but there is little else we
-	       can do.  The alternatives are to return nil, which is
+	     can do.  The alternatives are to return nil, which is
-	       as bad as (and in many cases worse than) throwing the
+	     as bad as (and in many cases worse than) throwing the
-	       error, or to ignore the error, which will likely result
+	     error, or to ignore the error, which will likely result
-	       in inflooping.  */
+	     in inflooping.  */
-	    report_file_error ("Cannot create temporary name for prefix",
+	  report_file_error ("Cannot create temporary name for prefix",
-			       list1 (prefix));
+			     list1 (prefix));
-	  /* not reached */
+	  return Qnil; /* not reached */
 	}
 }
-RETURN_NOT_REACHED (Qnil);
 }
 DEFUN ("expand-file-name", Fexpand_file_name, 1, 2, 0, /*
 Convert filename NAME to absolute, and canonicalize it.
 {
 Bufbyte *colon = strrchr (nm, ':');
 if (colon)
 /* Only recognize colon as part of drive specifier if there is a
-	 single alphabetic character preceeding the colon (and if the
+	 single alphabetic character preceding the colon (and if the
 	 character before the drive letter, if present, is a directory
 	 separator); this is to support the remote system syntax used by
 	 ange-ftp, and the "po:username" syntax for POP mailboxes. */
 look_again:
 if (nm == colon)
 	  collapse_newdir = 0;
 #endif
 	}
 else			/* ~user/filename */
 	{
-	  for (p = nm; *p && (!IS_DIRECTORY_SEP (*p)); p++);
+	  for (p = nm; *p && (!IS_DIRECTORY_SEP (*p)); p++)
+	    DO_NOTHING;
 	  o = (Bufbyte *) alloca (p - nm + 1);
 	  memcpy (o, (char *) nm, p - nm);
 	  o [p - nm] = 0;
 	  /* #### marcpa's syncing note: FSF uses getpwnam even on NT,
 #ifdef __CYGWIN32__
 	  if ((user = user_login_name (NULL)) != NULL)
 	    {
 	      /* Does the user login name match the ~name? */
 	      if (strcmp(user,((char *) o + 1)) == 0)
 	        {
 		  newdir = (Bufbyte *)  get_home_directory();
 	          nm = p;
 		}
 	    }
 if (! newdir)
 {
 #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);
 	report_file_error ("Non-regular file", list1 (filename));
 	}
 }
 #endif /* S_ISREG && S_ISLNK */
 ofd = open( (char *) XSTRING_DATA (newname),
 	      O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, CREAT_MODE);
 if (ofd < 0)
 report_file_error ("Opening output file", list1 (newname));
 {
 				  INTP (ok_if_already_exists), 0);
 /* 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 behaviour pending a working fix. (jhar) */
+Reverted to previous behavior pending a working fix. (jhar) */
 #if defined(WINDOWSNT)
 /* Windows does not support this operation.  */
 report_file_error ("Adding new name", Flist (2, &filename));
 #else /* not defined(WINDOWSNT) */
 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 DOS_NT
-if (check_executable (XSTRING (abspath)->_data))
+if (check_executable (XSTRING_DATA (abspath)))
 st.st_mode |= S_IEXEC;
 #endif /* DOS_NT */
 #endif /* 0 */
 return make_int (st.st_mode & 07777);
 (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) */
+#if 0 /* !defined (WINDOWSNT) */  /* !defined (VMS) && !defined (APOLLO) */
 fstat (desc, &st);
 #endif
 /* NFS can report a write failure now.  */
 if (close (desc) < 0)
 as necessary). */
 XCAR (desc_locative) = Qnil;
 unbind_to (speccount, Qnil);
 }
-/* # if defined (WINDOWSNT) /* defined (VMS) || defined (APOLLO) */
+/* # if defined (WINDOWSNT) */ /* defined (VMS) || defined (APOLLO) */
 stat ((char *) XSTRING_DATA (fn), &st);
 /* #endif */
 #ifdef CLASH_DETECTION
 if (!auto_saving)
 DEFUN ("car-less-than-car", Fcar_less_than_car, 2, 2, 0, /*
 Return t if (car A) is numerically less than (car B).
 */
 (a, b))
 {
-return arithcompare (Fcar (a), Fcar (b), arith_less);
+Lisp_Object objs[2];
+objs[0] = Fcar (a);
+objs[1] = Fcar (b);
+return Flss (2, objs);
 }
 /* Heh heh heh, let's define this too, just to aggravate the person who
 wrote the above comment. */
 DEFUN ("cdr-less-than-cdr", Fcdr_less_than_cdr, 2, 2, 0, /*
 Return t if (cdr A) is numerically less than (cdr B).
 */
 (a, b))
 {
-return arithcompare (Fcdr (a), Fcdr (b), arith_less);
+Lisp_Object objs[2];
+objs[0] = Fcdr (a);
+objs[1] = Fcdr (b);
+return Flss (2, objs);
 }
 /* Build the complete list of annotations appropriate for writing out
 the text between START and END, by calling all the functions in
 write-region-annotate-functions and merging the lists they return.
 auto_save_expand_name (Lisp_Object name)
 {
 struct gcpro gcpro1;
 /* note that caller did NOT gc protect name, so we do it. */
-/* #### dmoore - this might not be neccessary, if condition_case_1
+/* #### dmoore - this might not be necessary, if condition_case_1
 protects it.  but I don't think it does. */
 GCPRO1 (name);
 RETURN_UNGCPRO (Fexpand_file_name (name, Qnil));
 }

Mercurial > hg > xemacs-beta

comparison src/fileio.c @ 380:8626e4521993 r21-2-5