Mercurial > emacs
view src/unexcw.c @ 68953:0ddd5b380ffb
Use allout invisible-text overlays instead of
selective display for concealed text. Also, lots of general
cleanup, and improved compatibility code.
(allout-version) Incremented, corrected, revised, and refined
module commentary.
(provide 'allout): Moved to the bottom, added a require of overlay.
(allout-encrypt-unencrypted-on-saves): Defaults to t instead of
`except-current'.
(allout-write-file-hook-handler): Minimize delay.
(count-trailing-whitespace-region): New function so
auto-encryption of current topic can resituate cursor exactly.
PGP/GPG encryption trims trailing whitespace from lines, which
must be accounted for across encryption then decryption.
(allout-command-prefix): Now defaults to "\C-c<space>" rather than
just plain "\C-c", to avoid intruding on user's keybinding space.
(allout-toggle-current-subtree-encryption): Pass along fetch-pass
parameter, so user request to provide a new password is done.
(allout-outside-normal-auto-fill-function, allout-auto-fill):
Refined mechanism for auto-filling behavior while in allout mode.
(allout-mode): Explicitly specify the mode map in the docstring.
Clarify provision for various write-file hook var names.
Adjusted for invisible-text overlays instead of selective-display.
(allout-depth): Really return 0 if not within any topic. This
rectifies `allout-beginning-of-level' and sequence numbering
errors that occur when cutting and pasting numbered topics.
Changed from a in-line subst to a regular function, as well.
(allout-pre-next-prefix): Renamed from allout-pre-next-preface.
(allout-end-of-subtree, allout-end-of-subtree)
(allout-end-of-entry, allout-end-of-current-heading)
(allout-next-visible-heading, allout-open-topic, allout-show-entry)
(allout-show-children, allout-show-to-offshoot)
(allout-hide-current-entry, allout-show-current-entry): Rectified
handling of trailing blank lines between items.
(allout-line-boundary-regexp, set-allout-regexp, allout-depth)
(allout-current-depth, allout-unprotected, allout-hidden-p)
(allout-on-current-heading-p, allout-listify-exposed)
(allout-chart-subtree, allout-goto-prefix)
(allout-back-to-current-heading, allout-get-body-text)
(allout-snug-back, allout-flag-current-subtree, allout-show-all)
(allout-hide-region-body, allout-toggle-subtree-encryption)
(allout-encrypt-string, allout-encrypted-key-info)
(allout-next-topic-pending-encryption, allout-encrypt-decrypted)
(allout-file-vars-section-data): Adjusted for use with
invisible-text overlays instead of selective-display.
(allout-kill-line, allout-kill-topic, allout-yank-processing):
Reworked for use with invisible text overlays.
(allout-current-topic-collapsed-p): New function.
(allout-hide-current-subtree): Use allout-current-topic-collapsed-p
to know when to close the containing topic.
(allout-pre-command-business, allout-post-command-business):
Simplify undo-batching and dynamic isearch exposure.
(allout-set-overlay-category): New for invisible-text overlays.
Sets properties of allout-overlay-category, used by
allout-flag-region to set invisible-text overlay properties.
(allout-get-invisibility-overlay): Get the first qualifying
invisibility overlay, so we can find the extent of it.
(allout-back-to-visible-text): Get to just before the beginnining
of the current invisibility overlay, if any.
(allout-overlay-insert-in-front-handler)
(allout-overlay-interior-modification-handler)
(allout-before-change-handler, allout-isearch-end-handler): New
functions to handle extraordinary actions affecting concealed
text.
(allout-flag-region): Use overlays instead of selective-display
for invisible text - by inheritence from the properties of
allout-overlay-category in mainline emacs, and applied
property-by-property in xemacs, some recent versions of which
don't inherit the properties from the category. Provisions to
respond to concealed-text edits simplified drastically.
(allout-isearch-rectification, allout-isearch-was-font-lock)
(allout-isearch-expose, allout-enwrap-isearch)
(allout-isearch-abort, allout-pre-was-isearching)
(allout-isearch-prior-pos, allout-isearch-did-quit)
(allout-isearch-dynamic-expose)
(allout-hide-current-entry-completely): Functions deleted.
(allout-undo-aggregation): Explicit undo aggregation no longer
necessary due to transition away from selective-display.
(set-allout-regexp, allout-up-current-level)
(allout-next-visible-heading, allout-forward-current-level)
(allout-open-topic, allout-reindent-body, allout-rebullet-topic)
(allout-kill-line, allout-yank-processing, allout-show-children)
(allout-expose-topic, allout-old-expose-topic)
(allout-listify-exposed, allout-insert-latex-header)
(allout-toggle-subtree-encryption, allout-encrypt-string)
(remove-from-invisibility-spec, allout-hide-current-subtree):
Ditched unused variables.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 17 Feb 2006 10:52:30 +0000 |
parents | 3bd95f4f2941 |
children | f5b44958a759 c5406394f567 |
line wrap: on
line source
/* unexec() support for Cygwin; complete rewrite of xemacs Cygwin unexec() code Copyright (C) 2004, 2005, 2006 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <config.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) */