mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-09 01:05:39 -08:00
Fixes Bug#15880. This patch also makes Q constants (e.g., Qnil) constant addresses from the C point of view. * make-docfile.c: Revamp to generate table of symbols, too. Include <stdbool.h>. (xstrdup): New function. (main): Don't process the same file twice. (SYMBOL): New constant in enum global_type. (struct symbol): Turn 'value' member into a union, either v.value for int or v.svalue for string. All uses changed. (add_global): New arg svalue, which overrides value, so that globals can have a string value. (close_emacs_global): New arg num_symbols; all uses changed. Output lispsym decl. (write_globals): Output symbol globals too. Output more ATTRIBUTE_CONST, now that Qnil etc. are C constants. Output defsym_name table. (scan_c_file): Move most of guts into ... (scan_c_stream): ... new function. Scan for DEFSYMs and record symbols found. Don't read past EOF if file doesn't end in newline. * alloc.c, bidi.c, buffer.c, bytecode.c, callint.c, casefiddle: * casetab.c, category.c, ccl.c, charset.c, chartab.c, cmds.c, coding.c: * composite.c, data.c, dbusbind.c, decompress.c, dired.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, fns.c, font.c, fontset.c: * frame.c, fringe.c, ftfont.c, ftxfont.c, gfilenotify.c, gnutls.c: * image.c, inotify.c, insdel.c, keyboard.c, keymap.c, lread.c: * macfont.m, macros.c, minibuf.c, nsfns.m, nsfont.m, nsimage.m: * nsmenu.m, nsselect.m, nsterm.m, print.c, process.c, profiler.c: * search.c, sound.c, syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xftfont.c, xmenu.c, xml.c: * xselect.c, xsettings.c, xterm.c: Remove Q vars that represent symbols (e.g., Qnil, Qt, Qemacs). These names are now defined automatically by make-docfile. * alloc.c (init_symbol): New function. (Fmake_symbol): Use it. (c_symbol_p): New function. (valid_lisp_object_p, purecopy): Use it. * alloc.c (marked_pinned_symbols): Use make_lisp_symbol instead of make_lisp_ptr. (garbage_collect_1): Mark lispsym symbols. (CHECK_ALLOCATED_AND_LIVE_SYMBOL): New macro. (mark_object): Use it. (sweep_symbols): Sweep lispsym symbols. (symbol_uses_obj): New function. (which_symbols): Use it. Work for lispsym symbols, too. (init_alloc_once): Initialize Vpurify_flag here; no need to wait, since Qt's address is already known now. (syms_of_alloc): Add lispsym count to symbols_consed. * buffer.c (init_buffer_once): Compare to Qnil, not to make_number (0), when testing whether storage is all bits zero. * dispextern (struct image_type): * font.c (font_property_table): * frame.c (struct frame_parm_table, frame_parms): * keyboard.c (scroll_bar_parts, struct event_head): * xdisp.c (struct props): Use XSYMBOL_INIT (Qfoo) and struct Lisp_Symbol * rather than &Qfoo and Lisp_Object *, since Qfoo is no longer an object whose address can be taken. All uses changed. * eval.c (run_hook): New function. Most uses of Frun_hooks changed to use it, so that they no longer need to take the address of a Lisp sym. (syms_of_eval): Don't use DEFSYM on Vrun_hooks, as it's a variable. * frame.c (syms_of_frame): Add defsyms for the frame_parms table. * keyboard.c (syms_of_keyboard): Don't DEFSYM Qmenu_bar here. DEFSYM Qdeactivate_mark before the corresponding var. * keymap.c (syms_of_keymap): Use DEFSYM for Qmenu_bar and Qmode_line instead of interning their symbols; this avoids duplicates. (LISP_INITIALLY, TAG_PTR) (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END, XSYMBOL_INIT): New macros. (LISP_INITIALLY_ZERO): Use it. (enum symbol_interned, enum symbol_redirect, struct Lisp_Symbol) (EXFUN, DEFUN_ARGS_MANY, DEFUN_ARGS_UNEVALLED, DEFUN_ARGS_*): Move decls up, to avoid forward uses. Include globals.h earlier, too. (make_lisp_symbol): New function. (XSETSYMBOL): Use it. (DEFSYM): Now just a placeholder for make-docfile. * lread.c (DEFINE_SYMBOLS): Define, for globals.h. (intern_sym): New function, with body taken from old intern_driver. (intern_driver): Use it. Last arg is now Lisp integer, not ptrdiff_t. All uses changed. (define_symbol): New function. (init_obarray): Define the C symbols taken from lispsym. Use plain DEFSYM for Qt and Qnil. * syntax.c (init_syntax_once): No need to worry about Qchar_table_extra_slots.
217 lines
5.7 KiB
C
217 lines
5.7 KiB
C
/* Interface to zlib.
|
||
Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
||
|
||
This file is part of GNU Emacs.
|
||
|
||
GNU Emacs 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.
|
||
|
||
GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#include <config.h>
|
||
|
||
#ifdef HAVE_ZLIB
|
||
|
||
#include <zlib.h>
|
||
|
||
#include "lisp.h"
|
||
#include "character.h"
|
||
#include "buffer.h"
|
||
|
||
#include <verify.h>
|
||
|
||
#ifdef WINDOWSNT
|
||
# include <windows.h>
|
||
# include "w32.h"
|
||
|
||
DEF_DLL_FN (int, inflateInit2_,
|
||
(z_streamp strm, int windowBits, const char *version,
|
||
int stream_size));
|
||
DEF_DLL_FN (int, inflate, (z_streamp strm, int flush));
|
||
DEF_DLL_FN (int, inflateEnd, (z_streamp strm));
|
||
|
||
static bool zlib_initialized;
|
||
|
||
static bool
|
||
init_zlib_functions (void)
|
||
{
|
||
HMODULE library = w32_delayed_load (Qzlib_dll);
|
||
|
||
if (!library)
|
||
return false;
|
||
|
||
LOAD_DLL_FN (library, inflateInit2_);
|
||
LOAD_DLL_FN (library, inflate);
|
||
LOAD_DLL_FN (library, inflateEnd);
|
||
return true;
|
||
}
|
||
|
||
# undef inflate
|
||
# undef inflateEnd
|
||
# undef inflateInit2_
|
||
|
||
# define inflate fn_inflate
|
||
# define inflateEnd fn_inflateEnd
|
||
# define inflateInit2_ fn_inflateInit2_
|
||
|
||
#endif /* WINDOWSNT */
|
||
|
||
|
||
struct decompress_unwind_data
|
||
{
|
||
ptrdiff_t old_point, start, nbytes;
|
||
z_stream *stream;
|
||
};
|
||
|
||
static void
|
||
unwind_decompress (void *ddata)
|
||
{
|
||
struct decompress_unwind_data *data = ddata;
|
||
inflateEnd (data->stream);
|
||
|
||
/* Delete any uncompressed data already inserted on error. */
|
||
if (data->start)
|
||
del_range (data->start, data->start + data->nbytes);
|
||
|
||
/* Put point where it was, or if the buffer has shrunk because the
|
||
compressed data is bigger than the uncompressed, at
|
||
point-max. */
|
||
SET_PT (min (data->old_point, ZV));
|
||
}
|
||
|
||
DEFUN ("zlib-available-p", Fzlib_available_p, Szlib_available_p, 0, 0, 0,
|
||
doc: /* Return t if zlib decompression is available in this instance of Emacs. */)
|
||
(void)
|
||
{
|
||
#ifdef WINDOWSNT
|
||
Lisp_Object found = Fassq (Qzlib_dll, Vlibrary_cache);
|
||
if (CONSP (found))
|
||
return XCDR (found);
|
||
else
|
||
{
|
||
Lisp_Object status;
|
||
zlib_initialized = init_zlib_functions ();
|
||
status = zlib_initialized ? Qt : Qnil;
|
||
Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache);
|
||
return status;
|
||
}
|
||
#else
|
||
return Qt;
|
||
#endif
|
||
}
|
||
|
||
DEFUN ("zlib-decompress-region", Fzlib_decompress_region,
|
||
Szlib_decompress_region,
|
||
2, 2, 0,
|
||
doc: /* Decompress a gzip- or zlib-compressed region.
|
||
Replace the text in the region by the decompressed data.
|
||
On failure, return nil and leave the data in place.
|
||
This function can be called only in unibyte buffers. */)
|
||
(Lisp_Object start, Lisp_Object end)
|
||
{
|
||
ptrdiff_t istart, iend, pos_byte;
|
||
z_stream stream;
|
||
int inflate_status;
|
||
struct decompress_unwind_data unwind_data;
|
||
ptrdiff_t count = SPECPDL_INDEX ();
|
||
|
||
validate_region (&start, &end);
|
||
|
||
if (! NILP (BVAR (current_buffer, enable_multibyte_characters)))
|
||
error ("This function can be called only in unibyte buffers");
|
||
|
||
#ifdef WINDOWSNT
|
||
if (!zlib_initialized)
|
||
zlib_initialized = init_zlib_functions ();
|
||
if (!zlib_initialized)
|
||
{
|
||
message1 ("zlib library not found");
|
||
return Qnil;
|
||
}
|
||
#endif
|
||
|
||
/* This is a unibyte buffer, so character positions and bytes are
|
||
the same. */
|
||
istart = XINT (start);
|
||
iend = XINT (end);
|
||
move_gap_both (iend, iend);
|
||
|
||
stream.zalloc = Z_NULL;
|
||
stream.zfree = Z_NULL;
|
||
stream.opaque = Z_NULL;
|
||
stream.avail_in = 0;
|
||
stream.next_in = Z_NULL;
|
||
|
||
/* The magic number 32 apparently means "autodetect both the gzip and
|
||
zlib formats" according to zlib.h. */
|
||
if (inflateInit2 (&stream, MAX_WBITS + 32) != Z_OK)
|
||
return Qnil;
|
||
|
||
unwind_data.start = iend;
|
||
unwind_data.stream = &stream;
|
||
unwind_data.old_point = PT;
|
||
unwind_data.nbytes = 0;
|
||
record_unwind_protect_ptr (unwind_decompress, &unwind_data);
|
||
|
||
/* Insert the decompressed data at the end of the compressed data. */
|
||
SET_PT (iend);
|
||
|
||
pos_byte = istart;
|
||
|
||
/* Keep calling 'inflate' until it reports an error or end-of-input. */
|
||
do
|
||
{
|
||
/* Maximum number of bytes that one 'inflate' call should read and write.
|
||
Do not make avail_out too large, as that might unduly delay C-g.
|
||
zlib requires that avail_in and avail_out not exceed UINT_MAX. */
|
||
ptrdiff_t avail_in = min (iend - pos_byte, UINT_MAX);
|
||
int avail_out = 16 * 1024;
|
||
int decompressed;
|
||
|
||
if (GAP_SIZE < avail_out)
|
||
make_gap (avail_out - GAP_SIZE);
|
||
stream.next_in = BYTE_POS_ADDR (pos_byte);
|
||
stream.avail_in = avail_in;
|
||
stream.next_out = GPT_ADDR;
|
||
stream.avail_out = avail_out;
|
||
inflate_status = inflate (&stream, Z_NO_FLUSH);
|
||
pos_byte += avail_in - stream.avail_in;
|
||
decompressed = avail_out - stream.avail_out;
|
||
insert_from_gap (decompressed, decompressed, 0);
|
||
unwind_data.nbytes += decompressed;
|
||
QUIT;
|
||
}
|
||
while (inflate_status == Z_OK);
|
||
|
||
if (inflate_status != Z_STREAM_END)
|
||
return unbind_to (count, Qnil);
|
||
|
||
unwind_data.start = 0;
|
||
|
||
/* Delete the compressed data. */
|
||
del_range (istart, iend);
|
||
|
||
return unbind_to (count, Qt);
|
||
}
|
||
|
||
|
||
/***********************************************************************
|
||
Initialization
|
||
***********************************************************************/
|
||
void
|
||
syms_of_decompress (void)
|
||
{
|
||
DEFSYM (Qzlib_dll, "zlib");
|
||
defsubr (&Szlib_decompress_region);
|
||
defsubr (&Szlib_available_p);
|
||
}
|
||
|
||
#endif /* HAVE_ZLIB */
|