[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v |
Date: |
Sun, 13 Jan 2008 00:43:59 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/01/13 00:43:56
Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -b -r1.597 -r1.598
--- src/fileio.c 8 Jan 2008 20:44:29 -0000 1.597
+++ src/fileio.c 13 Jan 2008 00:43:54 -0000 1.598
@@ -68,10 +68,6 @@
#endif
#endif
-#ifdef APOLLO
-#include <sys/time.h>
-#endif
-
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
@@ -810,12 +806,6 @@
/* 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 DOS_NT
@@ -823,7 +813,6 @@
#endif
)
dst[slen - 1] = 0;
-#endif
#ifdef DOS_NT
CORRECT_DIR_SEPS (dst);
#endif
@@ -1788,10 +1777,6 @@
while (*p)
{
if (p[0] == '/' && p[1] == '/'
-#ifdef APOLLO
- /* // at start of filename is meaningful on Apollo system. */
- && nm != p
-#endif /* APOLLO */
)
nm = p + 1;
if (p[0] == '/' && p[1] == '~')
@@ -2023,10 +2008,6 @@
*o++ = *p++;
}
else if (!strncmp (p, "//", 2)
-#ifdef APOLLO
- /* // at start of filename is meaningful in Apollo system. */
- && o != target
-#endif /* APOLLO */
)
{
o = target;
@@ -2042,11 +2023,6 @@
{
while (o != target && *--o != '/')
;
-#ifdef APOLLO
- if (o == target + 1 && o[-1] == '/' && o[0] == '/')
- ++o;
- else
-#endif /* APOLLO */
if (o == target && *o == '/')
++o;
p += 3;
@@ -2097,11 +2073,11 @@
#endif /* VMS */
|| IS_DIRECTORY_SEP (p[-1]))
&& file_name_absolute_p (p)
-#if defined (APOLLO) || defined (WINDOWSNT) || defined(CYGWIN)
+#if defined (WINDOWSNT) || defined(CYGWIN)
/* // at start of file name is meaningful in Apollo,
WindowsNT and Cygwin systems. */
&& !(IS_DIRECTORY_SEP (p[0]) && p - 1 == nm)
-#endif /* not (APOLLO || WINDOWSNT || CYGWIN) */
+#endif /* not (WINDOWSNT || CYGWIN) */
)
{
for (s = p; *s && (!IS_DIRECTORY_SEP (*s)
@@ -3782,12 +3758,7 @@
}
if (total < 0)
#else
-#ifndef APOLLO
if (stat (SDATA (filename), &st) < 0)
-#else
- if ((fd = emacs_open (SDATA (filename), O_RDONLY, 0)) < 0
- || fstat (fd, &st) < 0)
-#endif /* not APOLLO */
#endif /* WINDOWSNT */
{
if (fd >= 0) emacs_close (fd);
@@ -4665,9 +4636,6 @@
{
if (!EQ (current_buffer->undo_list, Qt))
current_buffer->undo_list = Qnil;
-#ifdef APOLLO
- stat (SDATA (filename), &st);
-#endif
if (NILP (handler))
{
@@ -5376,16 +5344,14 @@
but who knows about all the other machines with NFS?) */
#if 0
- /* On VMS and APOLLO, must do the stat after the close
+ /* On VMS, must do the stat after the close
since closing changes the modtime. */
#ifndef VMS
-#ifndef APOLLO
/* Recall that #if defined does not work on VMS. */
#define FOO
fstat (desc, &st);
#endif
#endif
-#endif
/* NFS can report a write failure now. */
if (emacs_close (desc) < 0)