Mercurial > hg > xemacs-beta
view src/tls.h @ 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 | d59bfb050ca8 |
children |
line wrap: on
line source
/* Transport Layer Security implementation -- header file. Copyright (C) 2014 Jerry James 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/>. */ /* Synched up with: Not in FSF. */ /* Written by Jerry James. */ #ifndef INCLUDED_tls_h_ #define INCLUDED_tls_h_ extern Lisp_Object Qtls_error; void syms_of_tls (void); void vars_of_tls (void); void init_tls (void); #ifdef WITH_TLS #ifdef HAVE_NSS #include <prio.h> #define TLS_SETUP_SOCK 0 typedef struct tls_state { PRFileDesc *tls_file_desc; int tls_refcount; } tls_state_t; #endif #ifdef HAVE_GNUTLS #include <gnutls/gnutls.h> #define TLS_SETUP_SOCK 1 typedef struct tls_state { gnutls_session_t tls_session; int tls_refcount; } tls_state_t; #endif #ifdef HAVE_OPENSSL # include <openssl/ssl.h> #define TLS_SETUP_SOCK 1 typedef struct tls_state { SSL *tls_connection; int tls_refcount; } tls_state_t; #endif tls_state_t *tls_open (int, const Extbyte *); tls_state_t *tls_negotiate (int, const Extbyte *, Lisp_Object); void tls_close_connection (tls_state_t *); Lisp_Object make_tls_output_stream (tls_state_t *); Lisp_Object make_tls_input_stream (tls_state_t *); int tls_get_fd (tls_state_t *); Bytecount tls_read (tls_state_t *, unsigned char *, Bytecount, unsigned int); Bytecount tls_write (tls_state_t *, const unsigned char *, Bytecount, unsigned int); int tls_close (tls_state_t *); #else /* WITH_TLS */ typedef int tls_state_t; #define TLS_SETUP_SOCK 1 #define tls_open(x,y) ({ \ signal_error (Qtls_error, "TLS support unavailable", Qnil); \ NULL; }) #define tls_negotiate(x,y,z) NULL #define make_tls_input_stream(x) ({ \ signal_error (Qtls_error, "TLS support unavailable", Qnil); \ NULL; }) #define make_tls_output_stream(x) ({ \ signal_error (Qtls_error, "TLS support unavailable", Qnil); \ NULL; }) #define tls_get_fd(x) -1 #define tls_read(w,x,y,z) -1 #define tls_write(w,x,y,z) -1 #define tls_close(x) -1 #endif /* WITH_TLS */ #endif /* INCLUDED_tls_h_ */