Mercurial > hg > xemacs-beta
annotate lib-src/insert-data-in-exec.c @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 01:02:40 -0600 |
| parents | dfc9fe46c294 |
| children | 86d33ddc7fd6 |
| rev | line source |
|---|---|
|
4722
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
1 /* Copies the dump file inside the xemacs executable. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
2 Copyright (C) 2003-2004 Olivier Galibert. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
3 Copyright (C) 2003 Larry McVoy. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
4 |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
5 Redistribution and use in source and binary forms, with or without |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
6 modification, are permitted provided that the following conditions are met: |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
7 |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
8 1. Redistributions of source code must retain the above copyright notice, |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
9 this list of conditions and the following disclaimer. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
10 2. Redistributions in binary form must reproduce the above copyright notice, |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
11 this list of conditions and the following disclaimer in the documentation |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
12 and/or other materials provided with the distribution. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
13 |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
14 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
15 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
16 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LARRY |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
17 MCVOY, THE XEMACS PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
18 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
19 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
20 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
21 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
22 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
23 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
24 |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
25 The views and conclusions contained in the software and documentation are those |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
26 of the authors and should not be interpreted as representing official policies, |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
27 either expressed or implied, of the XEmacs Project. |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
28 |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
29 The "key" array is the work of Larry McVoy. See |
|
dfc9fe46c294
Add BSD header to lib-src/insert-data-in-exec.c, with permission of Olivier
Jerry James <james@xemacs.org>
parents:
2502
diff
changeset
|
30 http://lkml.org/lkml/2003/7/11/141 for more information. */ |
| 2015 | 31 |
| 32 #include <stdio.h> | |
| 33 #include <stdlib.h> | |
| 34 #include <string.h> | |
| 35 | |
| 36 static const unsigned char key[] = { | |
| 37 255, | |
| 38 6, | |
| 39 1, | |
| 40 2, | |
| 41 3, | |
| 42 4, | |
| 43 255, | |
| 44 3, | |
| 45 9, | |
| 46 62, | |
| 47 255, | |
| 48 10, | |
| 49 4, | |
| 50 61, | |
| 51 255 | |
| 52 }; | |
| 53 | |
| 54 int main(int argc, char **argv) | |
| 55 { | |
| 56 FILE *te, *xe, *dump; | |
| 57 unsigned char *xed, *p; | |
| 58 long size, size_dump, size1, i; | |
| 59 long max_size, offset; | |
| 60 | |
| 61 char msg[65536]; | |
| 62 | |
| 63 if(argc != 6 && (argc != 3 || strcmp(argv[1], "-s"))) { | |
| 64 fprintf(stderr, "Usage:\n%s temacs xemacs.dmp xemacs size offset\n%s -s xemacs.dmp\n", argv[0], argv[0]); | |
| 65 exit(1); | |
| 66 } | |
| 67 | |
| 68 if(argc == 3) { | |
| 69 sprintf(msg, "Opening %s failed", argv[2]); | |
| 70 dump = fopen(argv[2], "rb+"); | |
| 71 if(!dump) { | |
| 72 perror(msg); | |
| 73 exit(1); | |
| 74 } | |
| 75 | |
| 76 if(fseek(dump, 0, SEEK_END)) { | |
| 77 perror("fseek end dump"); | |
| 78 exit(1); | |
| 79 } | |
| 80 | |
| 81 size = ftell(dump); | |
| 82 if(size == -1) { | |
| 83 perror("ftell dump"); | |
| 84 exit(1); | |
| 85 } | |
| 86 | |
| 87 printf("%ld\n", size); | |
| 88 exit(0); | |
| 89 } | |
| 90 | |
| 91 | |
| 92 max_size = strtol(argv[4], 0, 10); | |
| 93 offset = strtol(argv[5], 0, 10); | |
| 94 | |
| 95 sprintf(msg, "Opening %s failed", argv[1]); | |
| 96 te = fopen(argv[1], "rb"); | |
| 97 if(!te) { | |
| 98 perror(msg); | |
| 99 exit(1); | |
| 100 } | |
| 101 | |
| 102 if(fseek(te, 0, SEEK_END)) { | |
| 103 perror("fseek end"); | |
| 104 exit(1); | |
| 105 } | |
| 106 | |
| 107 size = ftell(te); | |
| 108 if(size == -1) { | |
| 109 perror("ftell"); | |
| 110 exit(1); | |
| 111 } | |
| 112 | |
| 113 if(fseek(te, 0, SEEK_SET)) { | |
| 114 perror("fseek beginning"); | |
| 115 exit(1); | |
| 116 } | |
| 117 | |
| 118 xed = malloc(size); | |
| 119 if(!xed) { | |
| 120 perror("malloc"); | |
| 121 exit(1); | |
| 122 } | |
| 123 | |
| 124 size1 = fread(xed, 1, size, te); | |
| 125 if(size1 != size) { | |
| 126 if(ferror(te)) { | |
| 127 perror("fread temacs"); | |
| 128 exit(1); | |
| 129 } | |
| 130 fprintf(stderr, "Fread returned %ld, expected %ld ?\n", size1, size); | |
| 131 exit(1); | |
| 132 } | |
| 133 | |
| 134 if(fclose(te)) { | |
| 135 perror("fclose temacs"); | |
| 136 exit(1); | |
| 137 } | |
| 138 | |
| 139 p = xed; | |
| 140 for(i=0; i<size-(long)sizeof(key); i++) { | |
| 141 if(!memcmp(p, key, sizeof(key))) | |
| 142 goto found; | |
| 143 p++; | |
| 144 } | |
| 145 | |
| 146 fprintf(stderr, "dumped_data key not found in executable.\n"); | |
| 147 exit(1); | |
| 148 | |
| 149 found: | |
| 150 fprintf(stderr, "dumped_data found at offset 0x%lx, patching.\n", i); | |
| 151 | |
| 152 sprintf(msg, "Opening %s failed", argv[2]); | |
| 2502 | 153 dump = fopen(argv[2], "rb"); |
| 2015 | 154 if(!dump) { |
| 155 perror(msg); | |
| 156 exit(1); | |
| 157 } | |
| 158 | |
| 159 if(fseek(dump, 0, SEEK_END)) { | |
| 160 perror("fseek end dump"); | |
| 161 exit(1); | |
| 162 } | |
| 163 | |
| 164 size_dump = ftell(dump); | |
| 165 if(size_dump == -1) { | |
| 166 perror("ftell dump"); | |
| 167 exit(1); | |
| 168 } | |
| 169 | |
| 170 if(size_dump > max_size) { | |
| 2022 | 171 fprintf(stderr, "Dump file too big for available space (max=%ld, dump=%ld)\n", max_size, size_dump); |
| 2015 | 172 exit(2); |
| 173 } | |
| 174 | |
| 175 if(fseek(dump, 0, SEEK_SET)) { | |
| 176 perror("fseek beginning dump"); | |
| 177 exit(1); | |
| 178 } | |
| 179 | |
| 180 size1 = fread(xed+i+offset, 1, size_dump, dump); | |
| 181 if(size1 != size_dump) { | |
| 182 if(ferror(dump)) { | |
| 183 perror("fread dump"); | |
| 184 exit(1); | |
| 185 } | |
| 186 fprintf(stderr, "Fread dump returned %ld, expected %ld ?\n", size1, size_dump); | |
| 187 exit(1); | |
| 188 } | |
| 189 | |
| 190 if(fclose(dump)) { | |
| 191 perror("fclose dump"); | |
| 192 exit(1); | |
| 193 } | |
| 194 | |
| 195 memset(xed+i, 0, offset); | |
| 196 | |
| 197 xed[i ] = size_dump; | |
| 198 xed[i+1] = size_dump >> 8; | |
| 199 xed[i+2] = size_dump >> 16; | |
| 200 xed[i+3] = size_dump >> 24; | |
| 201 | |
| 202 fprintf(stderr, "dumped_data found at offset 0x%lx, patching.\n", i); | |
| 203 | |
| 204 sprintf(msg, "Opening %s failed", argv[3]); | |
| 205 xe = fopen(argv[3], "wb"); | |
| 206 if(!xe) { | |
| 207 perror(msg); | |
| 208 exit(1); | |
| 209 } | |
| 210 | |
| 211 size1 = fwrite(xed, 1, size, xe); | |
| 212 if(size1 != size) { | |
| 213 if(ferror(xe)) { | |
| 214 perror("fwrite xemacs"); | |
| 215 exit(1); | |
| 216 } | |
| 217 fprintf(stderr, "Fwrite xemacs returned %ld, expected %ld ?\n", size1, size); | |
| 218 exit(1); | |
| 219 } | |
| 220 | |
| 221 if(fclose(xe)) { | |
| 222 perror("fclose xemacs"); | |
| 223 exit(1); | |
| 224 } | |
| 225 | |
| 226 exit(0); | |
| 227 } | |
| 228 |