HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid encoding file names run through dostounix_filename on MS-Windows.
[bpt/emacs.git]
/
src
/
unexcoff.c
diff --git
a/src/unexcoff.c
b/src/unexcoff.c
index
fb221da
..
466a5c0
100644
(file)
--- a/
src/unexcoff.c
+++ b/
src/unexcoff.c
@@
-1,5
+1,5
@@
-/* Copyright (C) 1985
, 1986, 1987, 1988, 1992, 1993, 1994, 2001, 2002, 2003,
-
2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
+/* Copyright (C) 1985
-1988, 1992-1994, 2001-2013 Free Software
+
*
Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-51,6
+51,8
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/
#include <config.h>
*/
#include <config.h>
+#include "unexec.h"
+
#define PERROR(file) report_error (file, new)
#ifndef CANNOT_DUMP /* all rest of file! */
#define PERROR(file) report_error (file, new)
#ifndef CANNOT_DUMP /* all rest of file! */
@@
-97,7
+99,7
@@
struct aouthdr
#include <sys/file.h>
#include <sys/file.h>
-extern char *start_of_data (void); /* Start of initialized data */
+#include "mem-limits.h"
static long block_copy_start; /* Old executable start point */
static struct filehdr f_hdr; /* File header */
static long block_copy_start; /* Old executable start point */
static struct filehdr f_hdr; /* File header */
@@
-119,7
+121,6
@@
static int pagemask;
#define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
#define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
-#include <setjmp.h>
#include "lisp.h"
static void
#include "lisp.h"
static void
@@
-332,11
+333,7
@@
write_segment (int new, const char *ptr, const char *end)
a gap between the old text segment and the old data segment.
This gap has probably been remapped into part of the text segment.
So write zeros for it. */
a gap between the old text segment and the old data segment.
This gap has probably been remapped into part of the text segment.
So write zeros for it. */
- if (ret == -1
-#ifdef EFAULT
- && errno == EFAULT
-#endif
- )
+ if (ret == -1 && errno == EFAULT)
{
/* Write only a page of zeros at once,
so that we don't overshoot the start
{
/* Write only a page of zeros at once,
so that we don't overshoot the start
@@
-523,7
+520,7
@@
adjust_lnnoptrs (int writedesc, int readdesc, const char *new_name)
*
* driving logic.
*/
*
* driving logic.
*/
-int
+void
unexec (const char *new_name, const char *a_name)
{
int new = -1, a_out = -1;
unexec (const char *new_name, const char *a_name)
{
int new = -1, a_out = -1;
@@
-544,17
+541,13
@@
unexec (const char *new_name, const char *a_name)
)
{
close (new);
)
{
close (new);
- return
-1
;
+ return;
}
close (new);
if (a_out >= 0)
close (a_out);
mark_x (new_name);
}
close (new);
if (a_out >= 0)
close (a_out);
mark_x (new_name);
- return 0;
}
#endif /* not CANNOT_DUMP */
}
#endif /* not CANNOT_DUMP */
-
-/* arch-tag: 62409b69-e27a-4a7c-9413-0210d6b54e7f
- (do not change this comment) */