Mercurial > hg > xemacs-beta
view lib-src/make-dump-id.c @ 5916:1152e0091f8c
Avoid confusion about ELC vs. source file encoding, #'load, #'load-internal.
lisp/ChangeLog addition:
2015-06-03 Aidan Kehoe <kehoea@parhasard.net>
* code-files.el (load):
Revise this to respect load-ignore-out-of-date-elc-files, rather
than leaving that to #'load-internal. Avoids a corner case where
the source and the compiled file have different, incompatible
encodings.
Move the call to #'substitute-in-file-name here.
No longer check for a zero-length filename, since #'load-internal
no longer chokes on same and errors correctly.
src/ChangeLog addition:
2015-06-03 Aidan Kehoe <kehoea@parhasard.net>
* lread.c (Fload_internal):
Delegate calling the handler and #'substitute-in-file-name to #'load.
Error correctly with a zero-length file name, instead of giving a
bus error on my machine.
Delegate the check for out-of-date ELC files to #'load,
avoiding a bug where the encoding of the ELC file and the source
file differed.
* lread.c (PRINT_LOADING_MESSAGE_1):
This is simplified, now we no longer have to talk about
out-of-date ELC files.
tests/ChangeLog addition:
2015-06-03 Aidan Kehoe <kehoea@parhasard.net>
* automated/file-tests.el:
Gross sanity check for #'load and #'load-internal with a
zero-length FILE, something that crashed until today.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 03 Jun 2015 20:13:07 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Generate a unique dump-id for use with the portable dumper. Copyright (C) 2000 Olivier Galibert, Martin Buchholz This file is part of XEmacs. XEmacs 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. XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <stdio.h> #include <stdlib.h> #include "../src/systime.h" #ifdef WIN32_NATIVE #include <sys/timeb.h> /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */ void gettimeofday (struct timeval *tv, struct timezone *tz) { struct _timeb tb; _ftime (&tb); tv->tv_sec = tb.time; tv->tv_usec = tb.millitm * 1000L; if (tz) { tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich */ tz->tz_dsttime = tb.dstflag; /* type of dst correction */ } } #endif /* Generates an (extremely) pseudo random number for the dump-id */ static unsigned int generate_dump_id (void) { EMACS_TIME thyme; EMACS_GET_TIME (thyme); return (unsigned int) (EMACS_SECS (thyme) ^ EMACS_USECS (thyme)); } int main (int argc, char **argv) { FILE *f; if ((f = fopen ("dump-id.c", "w")) == NULL) { perror ("open dump-id.c"); return EXIT_FAILURE; } /* dump_id is declared as extern "C" in dumper.h */ fputs ("extern\n", f); fputs ("#ifdef __cplusplus\n", f); fputs ("\"C\"\n", f); fputs ("#endif\n", f); fputs ("unsigned int dump_id;\n", f); fprintf (f, "unsigned int dump_id = %uU;\n", generate_dump_id ()); if ((fclose (f)) != 0) { perror ("close dump-id.c"); return EXIT_FAILURE; } return EXIT_SUCCESS; }