Mercurial > emacs
annotate src/unexnext.c @ 74021:234305495123
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 164-166)
- Update from CVS
2006-11-15 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-extract-address-components): Improve comment.
2006-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-util.el (gnus-extract-address-components): Work with address in
which the name portion contains @.
2006-11-14 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus.el (gnus-start): Move custom group up.
(gnus-select-method): Don't autoload, but make it available for
`customize-variable'.
(gnus-getenv-nntpserver): Don't autoload.
2006-11-14 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mml.el (mml-generate-mime-1): Use mm-string-as-unibyte instead of
mm-with-unibyte-current-buffer to make string unibyte.
* lisp/gnus/mm-decode.el (mm-insert-part): Use mm-string-to-multibyte instead of
mm-string-as-multibyte.
2006-11-09 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el: Merge from the trunk to fix the bug WRT double encoded
subjects.
(message-replacement-char): New variable.
(message-fix-before-sending): Use it.
(message-simplify-subject): New function to remove duplicate code.
(message-reply, message-followup): Use it.
(message-simplify-subject-functions): New variable.
(message-strip-subject-encoded-words): New function
2006-11-08 Wolfgang Jenkner <wjenkner@inode.at> (tiny change)
* lisp/gnus/gnus-sum.el (gnus-summary-catchup): Use gnus-sorted-intersection
instead of gnus-intersection because arguments of gnus-sorted-nunion
must be sorted. This avoids corruption of gnus-newsgroup-unreads.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-515
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 16 Nov 2006 11:10:48 +0000 |
parents | 3bd95f4f2941 |
children | e90d04cd455a c5406394f567 |
rev | line source |
---|---|
1349 | 1 /* Dump Emacs in macho format. |
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1990, 1993, 2002, 2003, 2004, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64770
diff
changeset
|
3 2005, 2006 Free Software Foundation, Inc. |
1349 | 4 Written by Bradley Taylor (btaylor@next.com). |
5 | |
6 This file is part of GNU Emacs. | |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 it under the terms of the GNU General Public License as published by | |
2660
b70f4760d769
Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>:
Jim Blandy <jimb@redhat.com>
parents:
1349
diff
changeset
|
10 the Free Software Foundation; either version 2, or (at your option) |
1349 | 11 any later version. |
12 | |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
1349 | 22 |
23 | |
24 #undef __STRICT_BSD__ | |
25 | |
26 #include <stdio.h> | |
27 #include <stdlib.h> | |
28 #include <stdarg.h> | |
2660
b70f4760d769
Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>:
Jim Blandy <jimb@redhat.com>
parents:
1349
diff
changeset
|
29 #include <mach/mach.h> |
b70f4760d769
Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>:
Jim Blandy <jimb@redhat.com>
parents:
1349
diff
changeset
|
30 #include <mach-o/loader.h> |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
31 #include <mach-o/reloc.h> |
1349 | 32 #include <sys/file.h> |
33 #include <sys/stat.h> | |
19669
e8e724dad99a
Include unistd.h instead of libc.h.
Richard M. Stallman <rms@gnu.org>
parents:
16853
diff
changeset
|
34 #include <unistd.h> |
19670 | 35 /* Instead of unistd.h, this used to include libc.h. |
36 "Nelson H. F. Beebe" <beebe@math.utah.edu> says that doesn't work | |
37 in system version 3.3. */ | |
1349 | 38 |
39 | |
2660
b70f4760d769
Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>:
Jim Blandy <jimb@redhat.com>
parents:
1349
diff
changeset
|
40 int malloc_cookie; |
1349 | 41 |
42 /* | |
43 * Kludge: we don't expect any program data beyond VM_HIGHDATA | |
44 * What is really needed is a way to find out from malloc() which | |
45 * pages it vm_allocated and write only those out into the data segment. | |
46 * | |
47 * This kludge may break when we stop using fixed virtual address | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
48 * shared libraries. Actually, emacs will probably continue working, but be |
1349 | 49 * much larger on disk than it needs to be (because non-malloced data will |
50 * be in the file). | |
51 */ | |
52 static const unsigned VM_HIGHDATA = 0x2000000; | |
53 | |
54 typedef struct region_t { | |
55 vm_address_t address; | |
56 vm_size_t size; | |
57 vm_prot_t protection; | |
58 vm_prot_t max_protection; | |
59 vm_inherit_t inheritance; | |
60 boolean_t shared; | |
61 port_t object_name; | |
62 vm_offset_t offset; | |
63 } region_t; | |
64 | |
65 | |
66 static void | |
67 grow( | |
68 struct load_command ***the_commands, | |
69 unsigned *the_commands_len | |
70 ) | |
71 { | |
72 if (*the_commands == NULL) { | |
73 *the_commands_len = 1; | |
74 *the_commands = malloc(sizeof(*the_commands)); | |
75 } else { | |
76 (*the_commands_len)++; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
77 *the_commands = realloc(*the_commands, |
1349 | 78 (*the_commands_len * |
79 sizeof(**the_commands))); | |
80 } | |
81 } | |
82 | |
83 | |
84 static void | |
85 save_command( | |
86 struct load_command *command, | |
87 struct load_command ***the_commands, | |
88 unsigned *the_commands_len | |
89 ) | |
90 { | |
91 struct load_command **tmp; | |
92 | |
93 grow(the_commands, the_commands_len); | |
94 tmp = &(*the_commands)[*the_commands_len - 1]; | |
95 *tmp = malloc(command->cmdsize); | |
96 bcopy(command, *tmp, command->cmdsize); | |
97 } | |
98 | |
99 static void | |
100 fatal_unexec(char *format, ...) | |
101 { | |
102 va_list ap; | |
103 | |
104 va_start(ap, format); | |
105 fprintf(stderr, "unexec: "); | |
106 vfprintf(stderr, format, ap); | |
107 fprintf(stderr, "\n"); | |
108 va_end(ap); | |
109 } | |
110 | |
111 static int | |
112 read_macho( | |
113 int fd, | |
114 struct mach_header *the_header, | |
115 struct load_command ***the_commands, | |
116 unsigned *the_commands_len | |
117 ) | |
118 { | |
119 struct load_command command; | |
120 struct load_command *buf; | |
121 int i; | |
122 int size; | |
123 | |
124 if (read(fd, the_header, sizeof(*the_header)) != sizeof(*the_header)) { | |
125 fatal_unexec("cannot read macho header"); | |
126 return (0); | |
127 } | |
128 for (i = 0; i < the_header->ncmds; i++) { | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
129 if (read(fd, &command, sizeof(struct load_command)) != |
1349 | 130 sizeof(struct load_command)) { |
131 fatal_unexec("cannot read macho load command header"); | |
132 return (0); | |
133 } | |
134 size = command.cmdsize - sizeof(struct load_command); | |
135 if (size < 0) { | |
136 fatal_unexec("bogus load command size"); | |
137 return (0); | |
138 } | |
139 buf = malloc(command.cmdsize); | |
140 buf->cmd = command.cmd; | |
141 buf->cmdsize = command.cmdsize; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
142 if (read(fd, ((char *)buf + |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
143 sizeof(struct load_command)), |
1349 | 144 size) != size) { |
145 fatal_unexec("cannot read load command data"); | |
146 return (0); | |
147 } | |
148 save_command(buf, the_commands, the_commands_len); | |
149 } | |
150 return (1); | |
151 } | |
152 | |
153 static int | |
154 filldatagap( | |
155 vm_address_t start_address, | |
156 vm_size_t *size, | |
157 vm_address_t end_address | |
158 ) | |
159 { | |
160 vm_address_t address; | |
161 vm_size_t gapsize; | |
162 | |
163 address = (start_address + *size); | |
164 gapsize = end_address - address; | |
165 *size += gapsize; | |
166 if (vm_allocate(task_self(), &address, gapsize, | |
167 FALSE) != KERN_SUCCESS) { | |
168 fatal_unexec("cannot vm_allocate"); | |
169 return (0); | |
170 } | |
171 return (1); | |
172 } | |
173 | |
174 static int | |
175 get_data_region( | |
176 vm_address_t *address, | |
177 vm_size_t *size | |
178 ) | |
179 { | |
180 region_t region; | |
181 kern_return_t ret; | |
182 struct section *sect; | |
183 | |
4598
cec168152d88
(get_data_region): Add cast to avoid warning.
Richard M. Stallman <rms@gnu.org>
parents:
2660
diff
changeset
|
184 sect = (struct section *) getsectbyname(SEG_DATA, SECT_DATA); |
1349 | 185 region.address = 0; |
186 *address = 0; | |
187 for (;;) { | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
188 ret = vm_region(task_self(), |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
189 ®ion.address, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
190 ®ion.size, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
191 ®ion.protection, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
192 ®ion.max_protection, |
1349 | 193 ®ion.inheritance, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
194 ®ion.shared, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
195 ®ion.object_name, |
1349 | 196 ®ion.offset); |
197 if (ret != KERN_SUCCESS || region.address >= VM_HIGHDATA) { | |
198 break; | |
199 } | |
200 if (*address != 0) { | |
201 if (region.address > *address + *size) { | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
202 if (!filldatagap(*address, size, |
1349 | 203 region.address)) { |
204 return (0); | |
205 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
206 } |
1349 | 207 *size += region.size; |
208 } else { | |
209 if (region.address == sect->addr) { | |
210 *address = region.address; | |
211 *size = region.size; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
212 } |
1349 | 213 } |
214 region.address += region.size; | |
215 } | |
216 return (1); | |
217 } | |
218 | |
219 static char * | |
220 my_malloc( | |
221 vm_size_t size | |
222 ) | |
223 { | |
224 vm_address_t address; | |
225 | |
226 if (vm_allocate(task_self(), &address, size, TRUE) != KERN_SUCCESS) { | |
227 return (NULL); | |
228 } | |
229 return ((char *)address); | |
230 } | |
231 | |
232 static void | |
233 my_free( | |
234 char *buf, | |
235 vm_size_t size | |
236 ) | |
237 { | |
238 vm_deallocate(task_self(), (vm_address_t)buf, size); | |
239 } | |
240 | |
241 static int | |
242 unexec_doit( | |
243 int infd, | |
244 int outfd | |
245 ) | |
246 { | |
247 int i; | |
248 struct load_command **the_commands = NULL; | |
249 unsigned the_commands_len; | |
250 struct mach_header the_header; | |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
251 int fgrowth = 0; |
1349 | 252 int fdatastart; |
253 int fdatasize; | |
254 int size; | |
255 struct stat st; | |
256 char *buf; | |
257 vm_address_t data_address; | |
258 vm_size_t data_size; | |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
259 vm_size_t vmaddr_growth = 0; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
260 vm_size_t dataseg_vmaddr, dataseg_vmend; |
1349 | 261 |
262 struct segment_command *segment; | |
263 | |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
264 #ifdef NS_TARGET |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
265 unsigned long extreloff = 0; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
266 unsigned long nextrel = 0; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
267 struct dysymtab_command *dysymtab; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
268 struct relocation_info reloc_info; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
269 #endif |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
270 |
1349 | 271 if (!read_macho(infd, &the_header, &the_commands, &the_commands_len)) { |
272 return (0); | |
273 } | |
274 | |
275 | |
2660
b70f4760d769
Changes for Emacs 19 from Thorsten Ohl <ohl@chico.harvard.edu>:
Jim Blandy <jimb@redhat.com>
parents:
1349
diff
changeset
|
276 malloc_cookie = malloc_freezedry (); |
1349 | 277 if (!get_data_region(&data_address, &data_size)) { |
278 return (0); | |
279 } | |
280 | |
281 | |
282 /* | |
283 * DO NOT USE MALLOC IN THIS SECTION | |
284 */ | |
285 { | |
286 /* | |
287 * Fix offsets | |
288 */ | |
289 for (i = 0; i < the_commands_len; i++) { | |
290 switch (the_commands[i]->cmd) { | |
291 case LC_SEGMENT: | |
292 segment = ((struct segment_command *) | |
293 the_commands[i]); | |
294 if (strcmp(segment->segname, SEG_DATA) == 0) { | |
295 fdatastart = segment->fileoff; | |
296 fdatasize = segment->filesize; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
297 fgrowth = (data_size - |
1349 | 298 segment->filesize); |
299 segment->vmsize = data_size; | |
300 segment->filesize = data_size; | |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
301 dataseg_vmaddr = segment->vmaddr; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
302 dataseg_vmend = segment->vmaddr + segment->vmsize; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
303 vmaddr_growth = segment->vmaddr + segment->vmsize; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
304 } else { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
305 ((struct segment_command *)the_commands[i])->fileoff += fgrowth; |
1349 | 306 } |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
307 |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
308 if( strcmp( segment->segname, SEG_LINKEDIT ) == 0 ) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
309 segment->vmaddr = vmaddr_growth; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
310 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
311 |
1349 | 312 break; |
313 case LC_SYMTAB: | |
314 ((struct symtab_command *) | |
315 the_commands[i])->symoff += fgrowth; | |
316 ((struct symtab_command *) | |
317 the_commands[i])->stroff += fgrowth; | |
318 break; | |
319 case LC_SYMSEG: | |
320 ((struct symseg_command *) | |
321 the_commands[i])->offset += fgrowth; | |
322 break; | |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
323 #ifdef NS_TARGET |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
324 case LC_DYSYMTAB: |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
325 dysymtab = ((struct dysymtab_command *)the_commands[i]); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
326 extreloff = dysymtab->extreloff; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
327 nextrel = dysymtab->nextrel; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
328 dysymtab->indirectsymoff += fgrowth; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
329 dysymtab->extreloff += fgrowth; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
330 break; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
331 #endif |
1349 | 332 default: |
333 break; | |
334 } | |
335 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
336 |
1349 | 337 /* |
338 * Write header | |
339 */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
340 if (write(outfd, &the_header, |
1349 | 341 sizeof(the_header)) != sizeof(the_header)) { |
342 fatal_unexec("cannot write output file"); | |
343 return (0); | |
344 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
345 |
1349 | 346 /* |
347 * Write commands | |
348 */ | |
349 for (i = 0; i < the_commands_len; i++) { | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
350 if (write(outfd, the_commands[i], |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
351 the_commands[i]->cmdsize) != |
1349 | 352 the_commands[i]->cmdsize) { |
353 fatal_unexec("cannot write output file"); | |
354 return (0); | |
355 } | |
356 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
357 |
1349 | 358 /* |
359 * Write original text | |
360 */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
361 if (lseek(infd, the_header.sizeofcmds + sizeof(the_header), |
1349 | 362 L_SET) < 0) { |
363 fatal_unexec("cannot seek input file"); | |
364 return (0); | |
365 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
366 size = fdatastart - (sizeof(the_header) + |
1349 | 367 the_header.sizeofcmds); |
368 buf = my_malloc(size); | |
369 if (read(infd, buf, size) != size) { | |
370 my_free(buf, size); | |
371 fatal_unexec("cannot read input file"); | |
372 } | |
373 if (write(outfd, buf, size) != size) { | |
374 my_free(buf, size); | |
375 fatal_unexec("cannot write output file"); | |
376 return (0); | |
377 } | |
378 my_free(buf, size); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
379 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
380 |
1349 | 381 /* |
382 * Write new data | |
383 */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
384 if (write(outfd, (char *)data_address, |
1349 | 385 data_size) != data_size) { |
386 fatal_unexec("cannot write output file"); | |
387 return (0); | |
388 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
389 |
1349 | 390 } |
391 | |
392 /* | |
393 * OKAY TO USE MALLOC NOW | |
394 */ | |
395 | |
396 /* | |
397 * Write rest of file | |
398 */ | |
399 fstat(infd, &st); | |
400 if (lseek(infd, fdatasize, L_INCR) < 0) { | |
401 fatal_unexec("cannot seek input file"); | |
402 return (0); | |
403 } | |
404 size = st.st_size - lseek(infd, 0, L_INCR); | |
405 | |
406 buf = malloc(size); | |
407 if (read(infd, buf, size) != size) { | |
408 free(buf); | |
409 fatal_unexec("cannot read input file"); | |
410 return (0); | |
411 } | |
412 if (write(outfd, buf, size) != size) { | |
413 free(buf); | |
414 fatal_unexec("cannot write output file"); | |
415 return (0); | |
416 } | |
417 free(buf); | |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
418 |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
419 #ifdef NS_TARGET |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
420 /* |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
421 * Fix up relocation entries in the data segment. |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
422 */ |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
423 |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
424 if (lseek(infd, extreloff, L_SET) < 0) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
425 fatal_unexec("cannot seek input file"); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
426 return (0); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
427 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
428 |
16853
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
429 for (i = 0; i < nextrel; i++) |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
430 { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
431 long zeroval = 0; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
432 |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
433 if (read(infd, &reloc_info, sizeof (reloc_info)) != sizeof (reloc_info)) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
434 fatal_unexec("cannot read input file"); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
435 return (0); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
436 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
437 if (reloc_info.r_address >= dataseg_vmaddr && reloc_info.r_address < dataseg_vmend) |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
438 { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
439 if (lseek (outfd, fdatastart + reloc_info.r_address - dataseg_vmaddr, L_SET) < 0 ) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
440 fatal_unexec("cannot seek input file"); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
441 return (0); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
442 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
443 switch (reloc_info.r_length) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
444 case 0: |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
445 if (write(outfd, &zeroval, 1) != 1) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
446 fatal_unexec("cannot write output file"); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
447 return (0); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
448 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
449 break; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
450 case 1: |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
451 if (write(outfd, &zeroval, 2) != 2) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
452 fatal_unexec("cannot write output file"); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
453 return (0); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
454 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
455 break; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
456 case 2: |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
457 if (write(outfd, &zeroval, 4) != 4) { |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
458 fatal_unexec("cannot write output file"); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
459 return (0); |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
460 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
461 break; |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
462 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
463 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
464 } |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
465 #endif |
63f2ad395c81
Include <mach-o/reloc.h>.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
466 |
1349 | 467 return (1); |
468 } | |
469 | |
470 void | |
471 unexec( | |
472 char *outfile, | |
473 char *infile | |
474 ) | |
475 { | |
476 int infd; | |
477 int outfd; | |
478 char tmpbuf[L_tmpnam]; | |
479 char *tmpfile; | |
480 | |
481 infd = open(infile, O_RDONLY, 0); | |
482 if (infd < 0) { | |
483 fatal_unexec("cannot open input file `%s'", infile); | |
484 exit(1); | |
485 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
19670
diff
changeset
|
486 |
1349 | 487 tmpnam(tmpbuf); |
488 tmpfile = rindex(tmpbuf, '/'); | |
489 if (tmpfile == NULL) { | |
490 tmpfile = tmpbuf; | |
491 } else { | |
492 tmpfile++; | |
493 } | |
494 outfd = open(tmpfile, O_WRONLY|O_TRUNC|O_CREAT, 0755); | |
495 if (outfd < 0) { | |
496 close(infd); | |
497 fatal_unexec("cannot open tmp file `%s'", tmpfile); | |
498 exit(1); | |
499 } | |
500 if (!unexec_doit(infd, outfd)) { | |
501 close(infd); | |
502 close(outfd); | |
503 unlink(tmpfile); | |
504 exit(1); | |
505 } | |
506 close(infd); | |
507 close(outfd); | |
508 if (rename(tmpfile, outfile) < 0) { | |
509 unlink(tmpfile); | |
510 fatal_unexec("cannot rename `%s' to `%s'", tmpfile, outfile); | |
511 exit(1); | |
512 } | |
513 } | |
52401 | 514 |
515 /* arch-tag: 9796bdc3-c050-417a-b2f5-4cfd31032634 | |
516 (do not change this comment) */ |