Mercurial > hg > xemacs-beta
annotate lib-src/insert-data-in-exec.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 261c5cd19207 |
| children | dfc9fe46c294 |
| rev | line source |
|---|---|
| 2015 | 1 /* Copies the dump file inside the xemacs executable */ |
| 2 | |
| 3 #include <stdio.h> | |
| 4 #include <stdlib.h> | |
| 5 #include <string.h> | |
| 6 | |
| 7 static const unsigned char key[] = { | |
| 8 255, | |
| 9 6, | |
| 10 1, | |
| 11 2, | |
| 12 3, | |
| 13 4, | |
| 14 255, | |
| 15 3, | |
| 16 9, | |
| 17 62, | |
| 18 255, | |
| 19 10, | |
| 20 4, | |
| 21 61, | |
| 22 255 | |
| 23 }; | |
| 24 | |
| 25 int main(int argc, char **argv) | |
| 26 { | |
| 27 FILE *te, *xe, *dump; | |
| 28 unsigned char *xed, *p; | |
| 29 long size, size_dump, size1, i; | |
| 30 long max_size, offset; | |
| 31 | |
| 32 char msg[65536]; | |
| 33 | |
| 34 if(argc != 6 && (argc != 3 || strcmp(argv[1], "-s"))) { | |
| 35 fprintf(stderr, "Usage:\n%s temacs xemacs.dmp xemacs size offset\n%s -s xemacs.dmp\n", argv[0], argv[0]); | |
| 36 exit(1); | |
| 37 } | |
| 38 | |
| 39 if(argc == 3) { | |
| 40 sprintf(msg, "Opening %s failed", argv[2]); | |
| 41 dump = fopen(argv[2], "rb+"); | |
| 42 if(!dump) { | |
| 43 perror(msg); | |
| 44 exit(1); | |
| 45 } | |
| 46 | |
| 47 if(fseek(dump, 0, SEEK_END)) { | |
| 48 perror("fseek end dump"); | |
| 49 exit(1); | |
| 50 } | |
| 51 | |
| 52 size = ftell(dump); | |
| 53 if(size == -1) { | |
| 54 perror("ftell dump"); | |
| 55 exit(1); | |
| 56 } | |
| 57 | |
| 58 printf("%ld\n", size); | |
| 59 exit(0); | |
| 60 } | |
| 61 | |
| 62 | |
| 63 max_size = strtol(argv[4], 0, 10); | |
| 64 offset = strtol(argv[5], 0, 10); | |
| 65 | |
| 66 sprintf(msg, "Opening %s failed", argv[1]); | |
| 67 te = fopen(argv[1], "rb"); | |
| 68 if(!te) { | |
| 69 perror(msg); | |
| 70 exit(1); | |
| 71 } | |
| 72 | |
| 73 if(fseek(te, 0, SEEK_END)) { | |
| 74 perror("fseek end"); | |
| 75 exit(1); | |
| 76 } | |
| 77 | |
| 78 size = ftell(te); | |
| 79 if(size == -1) { | |
| 80 perror("ftell"); | |
| 81 exit(1); | |
| 82 } | |
| 83 | |
| 84 if(fseek(te, 0, SEEK_SET)) { | |
| 85 perror("fseek beginning"); | |
| 86 exit(1); | |
| 87 } | |
| 88 | |
| 89 xed = malloc(size); | |
| 90 if(!xed) { | |
| 91 perror("malloc"); | |
| 92 exit(1); | |
| 93 } | |
| 94 | |
| 95 size1 = fread(xed, 1, size, te); | |
| 96 if(size1 != size) { | |
| 97 if(ferror(te)) { | |
| 98 perror("fread temacs"); | |
| 99 exit(1); | |
| 100 } | |
| 101 fprintf(stderr, "Fread returned %ld, expected %ld ?\n", size1, size); | |
| 102 exit(1); | |
| 103 } | |
| 104 | |
| 105 if(fclose(te)) { | |
| 106 perror("fclose temacs"); | |
| 107 exit(1); | |
| 108 } | |
| 109 | |
| 110 p = xed; | |
| 111 for(i=0; i<size-(long)sizeof(key); i++) { | |
| 112 if(!memcmp(p, key, sizeof(key))) | |
| 113 goto found; | |
| 114 p++; | |
| 115 } | |
| 116 | |
| 117 fprintf(stderr, "dumped_data key not found in executable.\n"); | |
| 118 exit(1); | |
| 119 | |
| 120 found: | |
| 121 fprintf(stderr, "dumped_data found at offset 0x%lx, patching.\n", i); | |
| 122 | |
| 123 sprintf(msg, "Opening %s failed", argv[2]); | |
| 2502 | 124 dump = fopen(argv[2], "rb"); |
| 2015 | 125 if(!dump) { |
| 126 perror(msg); | |
| 127 exit(1); | |
| 128 } | |
| 129 | |
| 130 if(fseek(dump, 0, SEEK_END)) { | |
| 131 perror("fseek end dump"); | |
| 132 exit(1); | |
| 133 } | |
| 134 | |
| 135 size_dump = ftell(dump); | |
| 136 if(size_dump == -1) { | |
| 137 perror("ftell dump"); | |
| 138 exit(1); | |
| 139 } | |
| 140 | |
| 141 if(size_dump > max_size) { | |
| 2022 | 142 fprintf(stderr, "Dump file too big for available space (max=%ld, dump=%ld)\n", max_size, size_dump); |
| 2015 | 143 exit(2); |
| 144 } | |
| 145 | |
| 146 if(fseek(dump, 0, SEEK_SET)) { | |
| 147 perror("fseek beginning dump"); | |
| 148 exit(1); | |
| 149 } | |
| 150 | |
| 151 size1 = fread(xed+i+offset, 1, size_dump, dump); | |
| 152 if(size1 != size_dump) { | |
| 153 if(ferror(dump)) { | |
| 154 perror("fread dump"); | |
| 155 exit(1); | |
| 156 } | |
| 157 fprintf(stderr, "Fread dump returned %ld, expected %ld ?\n", size1, size_dump); | |
| 158 exit(1); | |
| 159 } | |
| 160 | |
| 161 if(fclose(dump)) { | |
| 162 perror("fclose dump"); | |
| 163 exit(1); | |
| 164 } | |
| 165 | |
| 166 memset(xed+i, 0, offset); | |
| 167 | |
| 168 xed[i ] = size_dump; | |
| 169 xed[i+1] = size_dump >> 8; | |
| 170 xed[i+2] = size_dump >> 16; | |
| 171 xed[i+3] = size_dump >> 24; | |
| 172 | |
| 173 fprintf(stderr, "dumped_data found at offset 0x%lx, patching.\n", i); | |
| 174 | |
| 175 sprintf(msg, "Opening %s failed", argv[3]); | |
| 176 xe = fopen(argv[3], "wb"); | |
| 177 if(!xe) { | |
| 178 perror(msg); | |
| 179 exit(1); | |
| 180 } | |
| 181 | |
| 182 size1 = fwrite(xed, 1, size, xe); | |
| 183 if(size1 != size) { | |
| 184 if(ferror(xe)) { | |
| 185 perror("fwrite xemacs"); | |
| 186 exit(1); | |
| 187 } | |
| 188 fprintf(stderr, "Fwrite xemacs returned %ld, expected %ld ?\n", size1, size); | |
| 189 exit(1); | |
| 190 } | |
| 191 | |
| 192 if(fclose(xe)) { | |
| 193 perror("fclose xemacs"); | |
| 194 exit(1); | |
| 195 } | |
| 196 | |
| 197 exit(0); | |
| 198 } | |
| 199 |