Commit e39a993c authored by Dan Nicolaescu's avatar Dan Nicolaescu

* movemail.c:

* make-docfile.c: Remove reference to symbols defined by systems
not supported anymore: MAC_OS8, XENIX and STRIDE.

* (src/m/mips.h):
* (src/m/intel386.h):
* callproc.c:
* config.in:
* ecrt0.c:
* emacs.c:
* fileio.c:
* frame.c:
* getpagesize.h:
* keyboard.c:
* lread.c:
* process.c:
* puresize.h:
* sysdep.c:
* systty.h:
* syswait.h:
* unexec.c:
* xdisp.c:
* alloc.c: Remove code containing references to symbols defined by
unsupported systems.
parent 8d8ccf36
2008-01-13 Dan Nicolaescu <dann@ics.uci.edu>
* movemail.c:
* make-docfile.c: Remove reference to symbols defined by systems
not supported anymore: MAC_OS8, XENIX and STRIDE.
2008-01-12 Eli Zaretskii <eliz@gnu.org>
* emacsclient.c (decode_options) [WINDOWSNT]: Don't use the value
......
......@@ -62,11 +62,7 @@ Boston, MA 02110-1301, USA. */
#endif /* not DOS_NT */
#ifndef DIRECTORY_SEP
#ifdef MAC_OS8
#define DIRECTORY_SEP ':'
#else /* not MAC_OS8 */
#define DIRECTORY_SEP '/'
#endif /* not MAC_OS8 */
#endif
#ifndef IS_DIRECTORY_SEP
......
......@@ -503,13 +503,7 @@ main (argc, argv)
#ifdef MAIL_USE_SYSTEM_LOCK
if (! preserve_mail)
{
#if defined (STRIDE) || defined (XENIX)
/* Stride, xenix have file locking, but no ftruncate.
This mess will do. */
close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666));
#else
ftruncate (indesc, 0L);
#endif /* STRIDE or XENIX */
}
#endif /* MAIL_USE_SYSTEM_LOCK */
......
2008-01-13 Dan Nicolaescu <dann@ics.uci.edu>
* (unexsunos4): Remove file, system not supported anymore.
* (src/m/mips.h):
* (src/m/intel386.h):
* callproc.c:
* config.in:
* ecrt0.c:
* emacs.c:
* fileio.c:
* frame.c:
* getpagesize.h:
* keyboard.c:
* lread.c:
* process.c:
* puresize.h:
* sysdep.c:
* systty.h:
* syswait.h:
* unexec.c:
* xdisp.c:
* alloc.c: Remove code containing references to symbols defined by
unsupported systems.
2008-01-11 Kenichi Handa <handa@ni.aist.go.jp>
* coding.c (detect_coding_mask): Fix previous change.
......
......@@ -1928,11 +1928,7 @@ allocate_string ()
consing_since_gc += sizeof *s;
#ifdef GC_CHECK_STRING_BYTES
if (!noninteractive
#ifdef MAC_OS8
&& current_sblock
#endif
)
if (!noninteractive)
{
if (++check_string_bytes_count == 200)
{
......
......@@ -160,14 +160,14 @@ Lisp_Object
call_process_cleanup (fdpid)
Lisp_Object fdpid;
{
#if defined (MSDOS) || defined (MAC_OS8)
#if defined (MSDOS)
/* for MSDOS fdpid is really (fd . tempfile) */
register Lisp_Object file;
file = Fcdr (fdpid);
emacs_close (XFASTINT (Fcar (fdpid)));
if (strcmp (SDATA (file), NULL_DEVICE) != 0)
unlink (SDATA (file));
#else /* not MSDOS and not MAC_OS8 */
#else /* not MSDOS */
register int pid = XFASTINT (Fcdr (fdpid));
if (call_process_exited)
......@@ -244,10 +244,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
char *outf, *tempfile;
int outfilefd;
#endif
#ifdef MAC_OS8
char *tempfile;
int outfilefd;
#endif
#if 0
int mask;
#endif
......@@ -470,39 +466,11 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
fd[1] = outfilefd;
#endif /* MSDOS */
#ifdef MAC_OS8
/* Since we don't have pipes on the Mac, create a temporary file to
hold the output of the subprocess. */
tempfile = (char *) alloca (SBYTES (Vtemp_file_name_pattern) + 1);
bcopy (SDATA (Vtemp_file_name_pattern), tempfile,
SBYTES (Vtemp_file_name_pattern) + 1);
mktemp (tempfile);
outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
if (outfilefd < 0)
{
close (filefd);
report_file_error ("Opening process output file",
Fcons (build_string (tempfile), Qnil));
}
fd[0] = filefd;
fd[1] = outfilefd;
#endif /* MAC_OS8 */
if (INTEGERP (buffer))
fd[1] = emacs_open (NULL_DEVICE, O_WRONLY, 0), fd[0] = -1;
else
{
#ifndef MSDOS
#ifndef MAC_OS8
errno = 0;
if (pipe (fd) == -1)
{
emacs_close (filefd);
report_file_error ("Creating process pipe", Qnil);
}
#endif
#endif
#if 0
/* Replaced by close_process_descs */
......@@ -561,52 +529,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
report_file_error ("Cannot redirect stderr", Fcons (error_file, Qnil));
}
#ifdef MAC_OS8
{
/* Call run_mac_command in sysdep.c here directly instead of doing
a child_setup as for MSDOS and other platforms. Note that this
code does not handle passing the environment to the synchronous
Mac subprocess. */
char *infn, *outfn, *errfn, *currdn;
/* close these files so subprocess can write to them */
close (outfilefd);
if (fd_error != outfilefd)
close (fd_error);
fd1 = -1; /* No harm in closing that one! */
infn = SDATA (infile);
outfn = tempfile;
if (NILP (error_file))
errfn = NULL_DEVICE;
else if (EQ (Qt, error_file))
errfn = outfn;
else
errfn = SDATA (error_file);
currdn = SDATA (current_dir);
pid = run_mac_command (new_argv, currdn, infn, outfn, errfn);
/* Record that the synchronous process exited and note its
termination status. */
synch_process_alive = 0;
synch_process_retcode = pid;
if (synch_process_retcode < 0) /* means it couldn't be exec'ed */
{
synchronize_system_messages_locale ();
synch_process_death = strerror (errno);
}
/* Since CRLF is converted to LF within `decode_coding', we can
always open a file with binary mode. */
fd[0] = open (tempfile, O_BINARY);
if (fd[0] < 0)
{
unlink (tempfile);
close (filefd);
report_file_error ("Cannot re-open temporary file", Qnil);
}
}
#else /* not MAC_OS8 */
#ifdef MSDOS /* MW, July 1993 */
/* Note that on MSDOS `child_setup' actually returns the child process
exit status, not its PID, so we assign it to `synch_process_retcode'
......@@ -669,7 +591,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
if (fd_error >= 0)
emacs_close (fd_error);
#endif /* not MSDOS */
#endif /* not MAC_OS8 */
environ = save_environ;
......@@ -703,14 +624,14 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
/* Enable sending signal if user quits below. */
call_process_exited = 0;
#if defined(MSDOS) || defined(MAC_OS8)
#if defined(MSDOS)
/* MSDOS needs different cleanup information. */
record_unwind_protect (call_process_cleanup,
Fcons (make_number (fd[0]), build_string (tempfile)));
#else
record_unwind_protect (call_process_cleanup,
Fcons (make_number (fd[0]), make_number (pid)));
#endif /* not MSDOS and not MAC_OS8 */
#endif /* not MSDOS */
if (BUFFERP (buffer))
......
......@@ -837,13 +837,6 @@ Boston, MA 02110-1301, USA. */
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
/* Define to 1 for Encore UMAX. */
#undef UMAX
/* Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h> instead of
<sys/cpustats.h>. */
#undef UMAX4_3
/* Define to the unexec source file name. */
#undef UNEXEC_SRC
......
......@@ -84,146 +84,6 @@ char **environ;
static start1 ();
#endif
#ifdef APOLLO
extern char *malloc(), *realloc(), *(*_libc_malloc) (), *(*_libc_realloc)();
extern void free(), (*_libc_free) (); extern int main();
std_$call void unix_$main();
_start()
{
_libc_malloc = malloc;
_libc_realloc = realloc;
_libc_free = free;
unix_$main(main); /* no return */
}
#endif /* APOLLO */
#if defined(orion) || defined(pyramid) || defined(celerity) || defined(ALLIANT) || defined(clipper) || defined(sps7)
#if defined(sps7) && defined(V3x)
asm(" section 10");
asm(" ds.b 0xb0");
#endif
#ifdef ALLIANT
/* _start must initialize _curbrk and _minbrk on the first startup;
when starting up after dumping, it must initialize them to what they were
before the dumping, since they are in the shared library and
are not dumped. See ADJUST_EXEC_HEADER in m-alliant.h. */
extern unsigned char *_curbrk, *_minbrk;
extern unsigned char end;
unsigned char *_setbrk = &end;
#ifdef ALLIANT_2800
unsigned char *_end = &end;
#endif
#endif
#ifndef DUMMIES
#define DUMMIES
#endif
_start (DUMMIES argc, argv, envp)
int argc;
char **argv, **envp;
{
#ifdef ALLIANT
#ifdef ALLIANT_2800
_curbrk = _end;
_minbrk = _end;
#else
_curbrk = _setbrk;
_minbrk = _setbrk;
#endif
#endif
environ = envp;
exit (main (argc, argv, envp));
}
#endif /* orion or pyramid or celerity or alliant or clipper */
#if defined (ns16000) && !defined (sequent) && !defined (UMAX) && !defined (CRT0_DUMMIES)
_start ()
{
/* On 16000, _start pushes fp onto stack */
start1 ();
}
/* ignore takes care of skipping the fp value pushed in start. */
static
start1 (ignore, argc, argv)
int ignore;
int argc;
register char **argv;
{
environ = argv + argc + 1;
if (environ == *argv)
environ--;
exit (main (argc, argv, environ));
}
#endif /* ns16000, not sequent and not UMAX, and not the CRT0_DUMMIES method */
#ifdef UMAX
_start()
{
asm(" exit [] # undo enter");
asm(" .set exitsc,1");
asm(" .set sigcatchall,0x400");
asm(" .globl _exit");
asm(" .globl start");
asm(" .globl __start");
asm(" .globl _main");
asm(" .globl _environ");
asm(" .globl _sigvec");
asm(" .globl sigentry");
asm("start:");
asm(" br .xstart");
asm(" .org 0x20");
asm(" .double p_glbl,0,0xf00000,0");
asm(" .org 0x30");
asm(".xstart:");
asm(" adjspb $8");
asm(" movd 8(sp),0(sp) # argc");
asm(" addr 12(sp),r0");
asm(" movd r0,4(sp) # argv");
asm("L1:");
asm(" movd r0,r1");
asm(" addqd $4,r0");
asm(" cmpqd $0,0(r1) # null args term ?");
asm(" bne L1");
asm(" cmpd r0,0(4(sp)) # end of 'env' or 'argv' ?");
asm(" blt L2");
asm(" addqd $-4,r0 # envp's are in list");
asm("L2:");
asm(" movd r0,8(sp) # env");
asm(" movd r0,@_environ # indir is 0 if no env ; not 0 if env");
asm(" movqd $0,tos # setup intermediate signal handler");
asm(" addr @sv,tos");
asm(" movzwd $sigcatchall,tos");
asm(" jsr @_sigvec");
asm(" adjspb $-12");
asm(" jsr @_main");
asm(" adjspb $-12");
asm(" movd r0,tos");
asm(" jsr @_exit");
asm(" adjspb $-4");
asm(" addr @exitsc,r0");
asm(" svc");
asm(" .align 4 # sigvec arg");
asm("sv:");
asm(" .double sigentry");
asm(" .double 0");
asm(" .double 0");
asm(" .comm p_glbl,1");
}
#endif /* UMAX */
#ifdef CRT0_DUMMIES
/* Define symbol "start": here; some systems want that symbol. */
......@@ -295,21 +155,10 @@ start1 (CRT0_DUMMIES argc, xargv)
asm (" global _start");
asm (" text");
asm ("_start:");
#ifndef NU
#ifdef STRIDE
asm (" comm havefpu%,2");
#else /* m68k, not STRIDE */
asm (" comm splimit%,4");
#endif /* STRIDE */
asm (" global exit");
asm (" text");
#ifdef STRIDE
asm (" trap &3");
asm (" mov.w %d0,havefpu%");
#else /* m68k, not STRIDE */
asm (" mov.l %d0,splimit%");
#endif /* STRIDE */
#endif /* not NU */
asm (" jsr start1");
asm (" mov.l %d0,(%sp)");
asm (" jsr exit");
......@@ -319,32 +168,6 @@ start1 (CRT0_DUMMIES argc, xargv)
#ifdef m68000
#ifdef ISI68K
/* Added by ESM Sun May 24 12:44:02 1987 to get new ISI library to work */
/* Edited by Ray Mon May 15 15:59:56 EST 1989 so we can compile with gcc */
#if defined(BSD4_3) && !defined(__GNUC__)
static foo () {
#endif
asm (" .globl is68020");
asm ("is68020:");
#ifndef BSD4_3
asm (" .long 0x00000000");
asm (" .long 0xffffffff");
/* End of stuff added by ESM */
#endif
asm (" .text");
asm (" .globl __start");
asm ("__start:");
asm (" .word 0");
asm (" link a6,#0");
asm (" jbsr _start1");
asm (" unlk a6");
asm (" rts");
#if defined(BSD4_3) && !defined(__GNUC__)
}
#endif
#else /* not ISI68K */
_start ()
{
#ifdef sun
......@@ -353,7 +176,6 @@ _start ()
/* On 68000, _start pushes a6 onto stack */
start1 ();
}
#endif /* not ISI68k */
#endif /* m68000 */
#endif /* m68k */
......@@ -373,15 +195,6 @@ start1 (ignore, argc, xargv)
if ((char *)environ == xargv)
environ--;
#ifdef sun_68881
asm(" jsr f68881_used");
#endif
#ifdef sun_fpa
asm(" jsr ffpa_used");
#endif
#ifdef sun_soft
asm(" jsr start_float");
#endif
exit (main (argc, argv, environ));
}
......@@ -503,85 +316,6 @@ char **argv_value;
#endif /* new hp assembler */
#endif /* hp9000s300 */
#ifdef GOULD
/* startup code has to be in near text rather
than fartext as allocated by the C compiler. */
asm(" .text");
asm(" .align 2");
asm(" .globl __start");
asm(" .text");
asm("__start:");
/* setup base register b1 (function base). */
asm(" .using b1,.");
asm(" tpcbr b1");
/* setup base registers b3 through b7 (data references). */
asm(" file basevals,b3");
/* setup base register b2 (stack pointer); it should be
aligned on a 8-word boundary; but because it is pointing
to argc, its value should be remembered (in r5). */
asm(" movw b2,r4");
asm(" movw b2,r5");
asm(" andw #~0x1f,r4");
asm(" movw r4,b2");
/* allocate stack frame to do some work. */
asm(" subea 16w,b2");
/* initialize signal catching for UTX/32 1.2; this is
necessary to make restart from saved image work. */
asm(" movea sigcatch,r1");
asm(" movw r1,8w[b2]");
asm(" svc #1,#150");
/* setup address of argc for start1. */
asm(" movw r5,8w[b2]");
asm(" func #1,_start1");
asm(" halt");
/* space for ld to store base register initial values. */
asm(" .align 5");
asm("basevals:");
asm(" .word __base3,__base4,__base5,__base6,__base7");
static
start1 (xargc)
int *xargc;
{
register int argc;
register char **argv;
argc = *xargc;
argv = (char **)(xargc) + 1;
environ = argv + argc + 1;
if (environ == argv)
environ--;
exit (main (argc, argv, environ));
}
#endif /* GOULD */
#ifdef elxsi
#include <elxsi/argvcache.h>
extern char **environ;
extern int errno;
extern void _init_doscan(), _init_iob();
extern char end[];
char *_init_brk = end;
_start()
{
environ = exec_cache.ac_envp;
brk (_init_brk);
errno = 0;
_init_doscan ();
_init_iob ();
_exit (exit (main (exec_cache.ac_argc,
exec_cache.ac_argv,
exec_cache.ac_envp)));
}
#endif /* elxsi */
#ifdef sparc
asm (".global __start");
asm (".text");
......
......@@ -1307,29 +1307,6 @@ main (argc, argv
CANNOT_DUMP is defined. */
syms_of_keyboard ();
#ifdef MAC_OS8
/* init_window_once calls make_terminal_frame which on Mac OS
creates a full-fledge output_mac type frame. This does not
work correctly before syms_of_textprop, syms_of_macfns,
syms_of_ccl, syms_of_fontset, syms_of_xterm, syms_of_search,
syms_of_frame, mac_term_init, and init_keyboard have already
been called. */
syms_of_textprop ();
syms_of_macfns ();
syms_of_ccl ();
syms_of_fontset ();
syms_of_macterm ();
syms_of_macmenu ();
syms_of_macselect ();
syms_of_data ();
syms_of_search ();
syms_of_frame ();
init_atimer ();
mac_term_init (build_string ("Mac"), NULL, NULL);
init_keyboard ();
#endif
init_window_once (); /* Init the window system. */
init_fileio_once (); /* Must precede any path manipulation. */
#ifdef HAVE_WINDOW_SYSTEM
......@@ -1351,9 +1328,7 @@ main (argc, argv
#ifdef CLASH_DETECTION
init_filelock ();
#endif
#ifndef MAC_OS8
init_atimer ();
#endif
running_asynch_code = 0;
/* Handle --unibyte and the EMACS_UNIBYTE envvar,
......@@ -1533,10 +1508,8 @@ main (argc, argv
/* The basic levels of Lisp must come first. */
/* And data must come first of all
for the sake of symbols like error-message. */
#ifndef MAC_OS8
/* Called before init_window_once for Mac OS Classic. */
syms_of_data ();
#endif
syms_of_alloc ();
syms_of_lread ();
syms_of_print ();
......@@ -1551,10 +1524,7 @@ main (argc, argv
syms_of_casetab ();
syms_of_callproc ();
syms_of_category ();
#ifndef MAC_OS8
/* Called before init_window_once for Mac OS Classic. */
syms_of_ccl ();
#endif
syms_of_charset ();
syms_of_cmds ();
#ifndef NO_DIR_LIBRARY
......@@ -1576,11 +1546,8 @@ main (argc, argv
syms_of_marker ();
syms_of_minibuf ();
syms_of_process ();
#ifndef MAC_OS8
/* Called before init_window_once for Mac OS Classic. */
syms_of_search ();
syms_of_frame ();
#endif
syms_of_syntax ();
syms_of_terminal ();
syms_of_term ();
......@@ -1588,10 +1555,7 @@ main (argc, argv
#ifdef HAVE_SOUND
syms_of_sound ();
#endif
#ifndef MAC_OS8
/* Called before init_window_once for Mac OS Classic. */
syms_of_textprop ();
#endif
syms_of_composite ();
#ifdef VMS
syms_of_vmsproc ();
......@@ -1673,10 +1637,7 @@ main (argc, argv
init_editfns (); /* init_process uses Voperating_system_release. */
init_process (); /* init_display uses add_keyboard_wait_descriptor. */
#ifndef MAC_OS8
/* Called before init_window_once for Mac OS Classic. */
init_keyboard (); /* This too must precede init_sys_modes. */
#endif
#ifdef VMS
init_vmsproc (); /* And this too. */
#endif /* VMS */
......
......@@ -68,10 +68,6 @@ extern int errno;
#endif
#endif
#ifdef APOLLO
#include <sys/time.h>
#endif
#include "lisp.h"
#include "intervals.h"
#include "buffer.h"
......@@ -810,12 +806,6 @@ directory_file_name (src, dst)
/* 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 @@ directory_file_name (src, dst)
#endif
)
dst[slen - 1] = 0;
#endif
#ifdef DOS_NT
CORRECT_DIR_SEPS (dst);