X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8c4b24b2ab14be6d33d4e979f3de6fb85eff6518..4618713ae48aac51c6f1a2474cc981f32c2bbede:/src/unexcoff.c
diff --git a/src/unexcoff.c b/src/unexcoff.c
index 466a5c0e49..5ac8ea8c9b 100644
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -52,6 +52,7 @@ along with GNU Emacs. If not, see . */
#include
#include "unexec.h"
+#include "lisp.h"
#define PERROR(file) report_error (file, new)
@@ -99,7 +100,7 @@ struct aouthdr
#include
-#include "mem-limits.h"
+extern int etext;
static long block_copy_start; /* Old executable start point */
static struct filehdr f_hdr; /* File header */
@@ -126,9 +127,10 @@ static int pagemask;
static void
report_error (const char *file, int fd)
{
+ int err = errno;
if (fd)
- close (fd);
- report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
+ emacs_close (fd);
+ report_file_errno ("Cannot unexec", build_string (file), err);
}
#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
@@ -138,7 +140,7 @@ report_error (const char *file, int fd)
static void
report_error_1 (int fd, const char *msg, int a1, int a2)
{
- close (fd);
+ emacs_close (fd);
error (msg, a1, a2);
}
@@ -168,7 +170,7 @@ make_hdr (int new, int a_out,
pagemask = getpagesize () - 1;
/* Adjust text/data boundary. */
- data_start = (int) start_of_data ();
+ data_start = (int) DATA_START;
data_start = ADDR_CORRECT (data_start);
data_start = data_start & ~pagemask; /* (Down) to page boundary. */
@@ -486,7 +488,7 @@ adjust_lnnoptrs (int writedesc, int readdesc, const char *new_name)
#ifdef MSDOS
if ((new = writedesc) < 0)
#else
- if ((new = open (new_name, O_RDWR)) < 0)
+ if ((new = emacs_open (new_name, O_RDWR, 0)) < 0)
#endif
{
PERROR (new_name);
@@ -510,7 +512,7 @@ adjust_lnnoptrs (int writedesc, int readdesc, const char *new_name)
}
}
#ifndef MSDOS
- close (new);
+ emacs_close (new);
#endif
return 0;
}
@@ -525,11 +527,11 @@ unexec (const char *new_name, const char *a_name)
{
int new = -1, a_out = -1;
- if (a_name && (a_out = open (a_name, O_RDONLY)) < 0)
+ if (a_name && (a_out = emacs_open (a_name, O_RDONLY, 0)) < 0)
{
PERROR (a_name);
}
- if ((new = creat (new_name, 0666)) < 0)
+ if ((new = emacs_open (new_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0)
{
PERROR (new_name);
}
@@ -540,13 +542,13 @@ unexec (const char *new_name, const char *a_name)
|| adjust_lnnoptrs (new, a_out, new_name) < 0
)
{
- close (new);
+ emacs_close (new);
return;
}
- close (new);
+ emacs_close (new);
if (a_out >= 0)
- close (a_out);
+ emacs_close (a_out);
mark_x (new_name);
}