xemacs-beta: src/unexec.c comparison

comparison src/unexec.c @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	de805c49cfc1
children

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 structure HDR and return the number of bytes to add to `a_text'
 before writing it (above and beyond the number of bytes of actual
 program text).  HDR's standard fields are already correct, except that
 this adjustment to the `a_text' field has not yet been made;
 thus, the amount of offset can depend on the data in the file.
 * A_TEXT_SEEK(HDR)
 If defined, this macro specifies the number of bytes to seek into the
 a.out file before starting to write the text segment.
 /* I don't know how correct this attempt to get more prototypes is... */
 # if defined(sun) && defined(_POSIX_SOURCE)
 #  undef _POSIX_SOURCE
 # endif
+# if defined(__lucid) && !defined(__STDC_EXTENDED__)
+#  define __STDC_EXTENDED__ 1
+# endif
 # include <stddef.h>
 # include <stdlib.h>
 # include <unistd.h>
 # include <string.h>
 # include <stddef.h>
-# include <errno.h>
+# ifdef __lucid
+#  include <sysent.h>
+# endif
 #endif
 /* I don't understand this, but it's necessary to get some slots in struct exec
 from /usr/include/sys/exec.h when running LCC in strict ANSI mode.  We don't
 #ifdef COFF_ENCAPSULATE
 int need_coff_header = 1;
 #include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */
 #else
+#ifdef MSDOS
+#if __DJGPP__ > 1
+#include <fcntl.h>  /* for O_RDONLY, O_RDWR */
+#endif
+#include <coff.h>
+#define filehdr external_filehdr
+#define scnhdr external_scnhdr
+#define syment external_syment
+#define auxent external_auxent
+#define n_numaux e_numaux
+#define n_type e_type
+struct aouthdr
+{
+unsigned short	magic;	/* type of file				*/
+unsigned short	vstamp;	/* version stamp			*/
+unsigned long		tsize;	/* text size in bytes, padded to FW bdry*/
+unsigned long		dsize;	/* initialized data "  "		*/
+unsigned long		bsize;	/* uninitialized data "   "		*/
+unsigned long		entry;	/* entry pt.				*/
+unsigned long	 	text_start;/* base of text used for this file */
+unsigned long	 	data_start;/* base of data used for this file */
+};
+#else /* not MSDOS */
 #include <a.out.h>
+#endif /* not MSDOS */
 #endif /* not COFF_ENCAPSULATE */
 /* Define getpagesize if the system does not.
 Note that this may depend on symbols defined in a.out.h.  */
 #include "getpagesize.h"
 #ifdef emacs
 #include "lisp.h"
 static void
-report_error (const char *file, int fd)
+report_error (file, fd)
+CONST char *file;
+int fd;
 {
 if (fd)
 close (fd);
 report_file_error ("Cannot unexec",
-		     Fcons (build_ext_string (file, Qfile_name), Qnil));
+		     Fcons (build_ext_string (file, FORMAT_FILENAME), Qnil));
 }
 #endif /* emacs */
 #define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
 #define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1
 #define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1
 static void
 report_error_1 (fd, msg, a1, a2)
 int fd;
-const char *msg;
+CONST char *msg;
 int a1, a2;
 {
 close (fd);
 #ifdef emacs
 error (msg, a1, a2);
 #endif
 )
 {
 close (new);
 /* unlink (new_name);	    	/ * Failed, unlink new a.out */
 return -1;
 }
 close (new);
 if (a_out >= 0)
 close (a_out);
 	}
 }
 #else /* COFF, but not USG_SHARED_LIBRARIES */
+#ifdef MSDOS
+#if __DJGPP__ >= 2
+/* Dump the original table of exception handlers, not the one
+where our exception hooks are registered.  */
+__djgpp_exception_toggle ();
+#endif
+#endif
 lseek (new, (long) text_scnptr, 0);
 ptr = (char *) f_ohdr.text_start;
 #ifdef HEADER_INCL_IN_TEXT
 /* For Gould UTX/32, text starts after headers */
 ptr = (char *) (ptr + text_scnptr);
 lseek (new, (long) data_scnptr, 0);
 ptr = (char *) f_ohdr.data_start;
 end = ptr + f_ohdr.dsize;
 write_segment (new, ptr, end);
+#ifdef MSDOS
+#if __DJGPP__ >= 2
+/* Restore our exception hooks.  */
+__djgpp_exception_toggle ();
+#endif
+#endif
 #endif /* USG_SHARED_LIBRARIES */
 #else /* if not COFF */
 FILE *pfile;
 char *temp_ptr;
 char c;
 int mcount_address, mcount_offset, count;
 extern char *_execname;
 /* The use of _execname is incompatible with RISCiX 1.1 */
 sprintf (command, "nm %s | fgrep mcount", _execname);
 if ( (pfile = popen(command, "r")) == NULL)
 if ((count == 0) || pclose(pfile) != NULL)
 {
 sprintf (errbuf, "Failed to execute the command '%s'\n", command);
 PERROR (errbuf);
 }
 sscanf(address_text, "%x", &mcount_address);
 ptr = (char *) unexec_text_start;
 mcount_offset = (char *)mcount_address - ptr;
 {
 int i, nwrite, ret;
 #if 0
 char buf[80];
 #endif
+extern int errno;
 /* This is the normal amount to write at once.
 It is the size of block that NFS uses.  */
 int writesize = 1 << 13;
 int pagesize = getpagesize ();
 char zeros[1 << 13];
 #endif
 if (!lnnoptr || !f_hdr.f_symptr)
 return 0;
+#ifdef MSDOS
+if ((new = writedesc) < 0)
+#else
 if ((new = open (new_name, O_RDWR)) < 0)
+#endif
 {
 PERROR (new_name);
 return -1;
 }
 	      lseek (new, -AUXESZ, 1);
 	      write (new, &auxentry, AUXESZ);
 	    }
 	}
 }
+#ifndef MSDOS
 close (new);
+#endif
 return 0;
 }
 #endif /* COFF_BSD_SYMBOLS */

Mercurial > hg > xemacs-beta

comparison src/unexec.c @ 412:697ef44129c6 r21-2-14