Mercurial > hg > xemacs-beta
view lib-src/insert-data-in-exec.c @ 5784:0cb4f494a548
Have the result of coding_character_tell() reflect str->convert_to, too.
src/ChangeLog addition:
2014-01-22 Aidan Kehoe <kehoea@parhasard.net>
* text.c (buffered_bytecount_to_charcount): New.
Return the number of characters in a coding or lstream buffer,
including partial characters at the beginning of the buffer, but
not including those at the end. Refactored from
Lstream_character_tell().
* text.h:
* text.h (buffered_bytecount_to_charcount): Declare it.
* lstream.c (Lstream_character_tell):
Use the refactored buffered_bytecount_to_charcount () here, both
for the unget buffer and in_buffer.
* file-coding.c (coding_character_tell):
Check the character count of the lstream buffer too, when passing
back the character count from the coding stream.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 22 Jan 2014 17:52:00 +0000 |
parents | 86d33ddc7fd6 |
children |
line wrap: on
line source
/* Copies the dump file inside the xemacs executable. Copyright (C) 2003-2004 Olivier Galibert. Copyright (C) 2003 Larry McVoy. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LARRY MCVOY, THE XEMACS PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the XEmacs Project. The "key" array is the work of Larry McVoy. See http://lkml.org/lkml/2003/7/11/141 for more information. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <config.h> static const unsigned char key[] = { 255, 6, 1, 2, 3, 4, 255, 3, 9, 62, 255, 10, 4, 61, 255 }; int main(int argc, char **argv) { FILE *te, *xe, *dump; unsigned char *xed, *p; size_t size, size_dump, size1, i; size_t max_size, offset; OFF_T off; char msg[65536]; if(argc != 6 && (argc != 3 || strcmp(argv[1], "-s"))) { fprintf(stderr, "Usage:\n%s temacs xemacs.dmp xemacs size offset\n%s -s xemacs.dmp\n", argv[0], argv[0]); exit(1); } if(argc == 3) { sprintf(msg, "Opening %s failed", argv[2]); dump = fopen(argv[2], "rb+"); if(!dump) { perror(msg); exit(1); } if(FSEEK(dump, 0, SEEK_END)) { perror("fseek end dump"); exit(1); } off = FTELL(dump); if(off == -1) { perror("ftell dump"); exit(1); } size = (size_t)off; printf("%zu\n", size); exit(0); } max_size = strtoul(argv[4], 0, 10); offset = strtoul(argv[5], 0, 10); sprintf(msg, "Opening %s failed", argv[1]); te = fopen(argv[1], "rb"); if(!te) { perror(msg); exit(1); } if(FSEEK(te, 0, SEEK_END)) { perror("fseek end"); exit(1); } off = FTELL(te); if(off == -1) { perror("ftell"); exit(1); } size = (size_t)off; if(FSEEK(te, 0, SEEK_SET)) { perror("fseek beginning"); exit(1); } xed = malloc(size); if(!xed) { perror("malloc"); exit(1); } size1 = fread(xed, 1, size, te); if(size1 != size) { if(ferror(te)) { perror("fread temacs"); exit(1); } fprintf(stderr, "Fread returned %zu, expected %zu ?\n", size1, size); exit(1); } if(fclose(te)) { perror("fclose temacs"); exit(1); } p = xed; for(i=0; i<size-sizeof(key); i++) { if(!memcmp(p, key, sizeof(key))) goto found; p++; } fprintf(stderr, "dumped_data key not found in executable.\n"); exit(1); found: fprintf(stderr, "dumped_data found at offset 0x%zx, patching.\n", i); sprintf(msg, "Opening %s failed", argv[2]); dump = fopen(argv[2], "rb"); if(!dump) { perror(msg); exit(1); } if(FSEEK(dump, 0, SEEK_END)) { perror("fseek end dump"); exit(1); } off = FTELL(dump); if(off == -1) { perror("ftell dump"); exit(1); } size_dump = (size_t)off; if(size_dump > max_size) { fprintf(stderr, "Dump file too big for available space (max=%zu, dump=%zu)\n", max_size, size_dump); exit(2); } if(FSEEK(dump, 0, SEEK_SET)) { perror("fseek beginning dump"); exit(1); } size1 = fread(xed+i+offset, 1, size_dump, dump); if(size1 != size_dump) { if(ferror(dump)) { perror("fread dump"); exit(1); } fprintf(stderr, "Fread dump returned %zu, expected %zu ?\n", size1, size_dump); exit(1); } if(fclose(dump)) { perror("fclose dump"); exit(1); } memset(xed+i, 0, offset); xed[i ] = size_dump; xed[i+1] = size_dump >> 8; xed[i+2] = size_dump >> 16; xed[i+3] = size_dump >> 24; fprintf(stderr, "dumped_data found at offset 0x%zx, patching.\n", i); sprintf(msg, "Opening %s failed", argv[3]); xe = fopen(argv[3], "wb"); if(!xe) { perror(msg); exit(1); } size1 = fwrite(xed, 1, size, xe); if(size1 != size) { if(ferror(xe)) { perror("fwrite xemacs"); exit(1); } fprintf(stderr, "Fwrite xemacs returned %zu, expected %zu ?\n", size1, size); exit(1); } if(fclose(xe)) { perror("fclose xemacs"); exit(1); } exit(0); }