Mercurial > emacs
view src/unexcw.c @ 106168:83924fb4f59c
2009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Rebuild
agenda after adding new entry.
* org-datetree.el (org-datetree-find-day-create): Fix regular
expression.
* org.el (org-display-outline-path): Use a format specifier for
message, to avoid problems with heading containing `%'.
* org-agenda.el (org-agenda-hide-tags-regexp): New option.
(org-format-agenda-item): Call `org-agenda-fix-displayed-tags'.
(org-agenda-fix-displayed-tags): New function.
(org-agenda-do-context-action): Just call
`org-display-outline-path', without piping the result through
`message'.
* org-latex.el (org-export-latex-preprocess): Protect secondary
footnote references.
* org-indent.el (org-indent-initialize): Avoid empty strings as
line prefixes.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
hat checking for the mark does not throw an error.
(org-agenda-diary-entry-in-org-file): Catch the case that there is
not `day' text property in the cursor line.
* org.el (org-sort-entries-or-items): Make sure that the final
entry has a newline before doing the sorting.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Get the text
property at the beginning of the line.
* org.el (org-make-link-string): Don't allow a description with
only white space.
* org-agenda.el (org-agenda-insert-diary-strategy): New variable.
(org-agenda-insert-diary-as-top-level): New function.
(org-agenda-add-entry-to-org-agenda-diary-file): Call
`org-agenda-insert-diary-as-top-level'.
* org.el (org-occur-in-agenda-files): Make sure none of the
buffers is narrowed.
(org-activate-plain-links): Add the face property here.
(org-set-font-lock-defaults): Do not add the face to plain links,
the activator function does this.
* org-habit.el (org-is-habit-p): Add doc string.
* org-archive.el (org-archive-subtree-default-with-confirmation):
Autoload.
* org-latex.el (org-export-latex-fontify): Fix regexp to make char
after match optional (happens at the end of a line...).
* org.el (org-fontify-meta-lines-and-blocks): Apply special faces
for special blocks.
* org-faces.el (org-copy-face): Set lisp indentation.
(org-quote, org-verse): New faces.
* org-agenda.el (org-agenda-remove-date): Remove variable.
* org-freemind.el (org-freemind-escape-str-from-org): Fix encoding.
* org-html.el (org-export-as-html): Move the home/up link into
the content div.
* org.el (org-export-latex-packages-alist): Option definition
moved here from org-latex.el.
* org-html.el (org-export-html-home/up-format): Add an ID to the
up/home div.
* org-wl.el (org-wl-store-link): Handle the case that
`wl-use-petname' is set.
* org.el (org-set-effort): Improve prompt.
(org-get-outline-path): Widen to get full path.
(org-compact-display-after-subtree-move): Function removed.
2009-11-20 Eric Schulte <schulte.eric@gmail.com>
* org-exp-blocks.el (org-export-blocks-format-ditaa): Use sha1
hash keys to cache and re-use images generated by the
org-exp-blocks interface to ditaa and dot.
* org.el (org-format-latex): Latex images are now saved to files
named by the sha1 hash of the latex source text avoiding
regeneration of identical images.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 20 Nov 2009 20:50:32 +0000 |
parents | 68dd71358159 |
children | 1d1d5d9bd884 |
line wrap: on
line source
/* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <setjmp.h> #include <lisp.h> #include <stdio.h> #include <fcntl.h> #include <a.out.h> #include <unistd.h> #include <assert.h> #define DOTEXE ".exe" extern int bss_sbrk_did_unexec; /* emacs symbols that indicate where bss and data end for emacs internals */ extern char my_endbss[]; extern char my_edata[]; /* ** header for Windows executable files */ typedef struct { FILHDR file_header; PEAOUTHDR file_optional_header; SCNHDR section_header[32]; } exe_header_t; int debug_unexcw = 0; /* ** Read the header from the executable into memory so we can more easily access it. */ static exe_header_t * read_exe_header (int fd, exe_header_t * exe_header_buffer) { int i; int ret; assert (fd >= 0); assert (exe_header_buffer != 0); ret = lseek (fd, 0L, SEEK_SET); assert (ret != -1); ret = read (fd, &exe_header_buffer->file_header, sizeof (exe_header_buffer->file_header)); assert (ret == sizeof (exe_header_buffer->file_header)); assert (exe_header_buffer->file_header.e_magic == 0x5a4d); assert (exe_header_buffer->file_header.nt_signature == 0x4550); assert (exe_header_buffer->file_header.f_magic == 0x014c); assert (exe_header_buffer->file_header.f_nscns > 0); assert (exe_header_buffer->file_header.f_nscns <= sizeof (exe_header_buffer->section_header) / sizeof (exe_header_buffer->section_header[0])); assert (exe_header_buffer->file_header.f_opthdr > 0); ret = read (fd, &exe_header_buffer->file_optional_header, sizeof (exe_header_buffer->file_optional_header)); assert (ret == sizeof (exe_header_buffer->file_optional_header)); assert (exe_header_buffer->file_optional_header.magic == 0x010b); for (i = 0; i < exe_header_buffer->file_header.f_nscns; ++i) { ret = read (fd, &exe_header_buffer->section_header[i], sizeof (exe_header_buffer->section_header[i])); assert (ret == sizeof (exe_header_buffer->section_header[i])); } return (exe_header_buffer); } /* ** Fix the dumped emacs executable: ** ** - copy .data section data of interest from running executable into ** output .exe file ** ** - convert .bss section into an initialized data section (like ** .data) and copy .bss section data of interest from running ** executable into output .exe file */ static void fixup_executable (int fd) { exe_header_t exe_header_buffer; exe_header_t *exe_header; int i; int ret; int found_data = 0; int found_bss = 0; exe_header = read_exe_header (fd, &exe_header_buffer); assert (exe_header != 0); assert (exe_header->file_header.f_nscns > 0); for (i = 0; i < exe_header->file_header.f_nscns; ++i) { unsigned long start_address = exe_header->section_header[i].s_vaddr + exe_header->file_optional_header.ImageBase; unsigned long end_address = exe_header->section_header[i].s_vaddr + exe_header->file_optional_header.ImageBase + exe_header->section_header[i].s_paddr; if (debug_unexcw) printf ("%8s start 0x%08x end 0x%08x\n", exe_header->section_header[i].s_name, start_address, end_address); if (my_edata >= (char *) start_address && my_edata < (char *) end_address) { /* data section */ ret = lseek (fd, (long) (exe_header->section_header[i].s_scnptr), SEEK_SET); assert (ret != -1); ret = write (fd, (char *) start_address, my_edata - (char *) start_address); assert (ret == my_edata - (char *) start_address); ++found_data; if (debug_unexcw) printf (" .data, mem start 0x%08x mem length %d\n", start_address, my_edata - (char *) start_address); if (debug_unexcw) printf (" .data, file start %d file length %d\n", (int) exe_header->section_header[i].s_scnptr, (int) exe_header->section_header[i].s_paddr); } else if (my_endbss >= (char *) start_address && my_endbss < (char *) end_address) { /* bss section */ ++found_bss; if (exe_header->section_header[i].s_flags & 0x00000080) { /* convert uninitialized data section to initialized data section */ struct stat statbuf; ret = fstat (fd, &statbuf); assert (ret != -1); exe_header->section_header[i].s_flags &= ~0x00000080; exe_header->section_header[i].s_flags |= 0x00000040; exe_header->section_header[i].s_scnptr = (statbuf.st_size + exe_header->file_optional_header.FileAlignment) / exe_header->file_optional_header.FileAlignment * exe_header->file_optional_header.FileAlignment; exe_header->section_header[i].s_size = (exe_header->section_header[i].s_paddr + exe_header->file_optional_header.FileAlignment) / exe_header->file_optional_header.FileAlignment * exe_header->file_optional_header.FileAlignment; ret = lseek (fd, (long) (exe_header->section_header[i].s_scnptr + exe_header->section_header[i].s_size - 1), SEEK_SET); assert (ret != -1); ret = write (fd, "", 1); assert (ret == 1); ret = lseek (fd, (long) ((char *) &exe_header->section_header[i] - (char *) exe_header), SEEK_SET); assert (ret != -1); ret = write (fd, &exe_header->section_header[i], sizeof (exe_header->section_header[i])); assert (ret == sizeof (exe_header->section_header[i])); if (debug_unexcw) printf (" seek to %ld, write %d\n", (long) ((char *) &exe_header->section_header[i] - (char *) exe_header), sizeof (exe_header->section_header[i])); } /* write initialized data section */ ret = lseek (fd, (long) (exe_header->section_header[i].s_scnptr), SEEK_SET); assert (ret != -1); ret = write (fd, (char *) start_address, my_endbss - (char *) start_address); assert (ret == (my_endbss - (char *) start_address)); if (debug_unexcw) printf (" .bss, mem start 0x%08x mem length %d\n", start_address, my_endbss - (char *) start_address); if (debug_unexcw) printf (" .bss, file start %d file length %d\n", (int) exe_header->section_header[i].s_scnptr, (int) exe_header->section_header[i].s_paddr); } } assert (found_bss == 1); assert (found_data == 1); } /* ** Windows likes .exe suffixes on executables. */ static char * add_exe_suffix_if_necessary (const char *name, char *modified) { int i = strlen (name); if (i <= (sizeof (DOTEXE) - 1)) { sprintf (modified, "%s%s", name, DOTEXE); } else if (!strcasecmp (name + i - (sizeof (DOTEXE) - 1), DOTEXE)) { strcpy (modified, name); } else { sprintf (modified, "%s%s", name, DOTEXE); } return (modified); } int unexec (char *outfile, char *infile, unsigned start_data, unsigned d1, unsigned d2) { char infile_buffer[FILENAME_MAX]; char outfile_buffer[FILENAME_MAX]; int fd_in; int fd_out; int ret; int ret2; if (bss_sbrk_did_unexec) { /* can only dump once */ printf ("You can only dump Emacs once on this platform.\n"); return (1); } report_sheap_usage (1); infile = add_exe_suffix_if_necessary (infile, infile_buffer); outfile = add_exe_suffix_if_necessary (outfile, outfile_buffer); fd_in = open (infile, O_RDONLY | O_BINARY); assert (fd_in >= 0); fd_out = open (outfile, O_RDWR | O_TRUNC | O_CREAT | O_BINARY, 0755); assert (fd_out >= 0); for (;;) { char buffer[4096]; ret = read (fd_in, buffer, sizeof (buffer)); if (ret == 0) { /* eof */ break; } assert (ret > 0); /* data */ ret2 = write (fd_out, buffer, ret); assert (ret2 == ret); } ret = close (fd_in); assert (ret == 0); bss_sbrk_did_unexec = 1; fixup_executable (fd_out); bss_sbrk_did_unexec = 0; ret = close (fd_out); assert (ret == 0); return (0); } /* arch-tag: fc44f6c3-ca0a-45e0-a5a2-58b6101b1e65 (do not change this comment) */