mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-25 14:27:34 +00:00
The specpdl_ref type is just an alias for ptrdiff_t; the compiled code remains the same. All operations on specpdl_ref (arithmetic, comparison etc) now go through inline functions. The bulk of the change is almost completely mechanical. It is done to prepare for a type-safe representation and subsequent performance improvement. * src/lisp.h (specpdl_ref, specpdl_count_to_ref, specpdl_ref_to_count) (specpdl_ref_eq, specpdl_ref_lt, specpdl_ref_valid_p) (make_invalid_specpdl_ref, specpdl_ref_add, specpdl_ref_to_ptr): New. (SPECPDL_INDEX, struct handler, USE_SAFE_ALLOCA, safe_free) (safe_free_unbind_to): * src/alloc.c (run_finalizer_function, inhibit_garbage_collection) (garbage_collect, Fgarbage_collect, which_symbols): * src/bidi.c (bidi_at_paragraph_end, bidi_find_paragraph_start): * src/buffer.c (Fkill_buffer, Fset_buffer_major_mode, Fmove_overlay) (Fdelete_overlay): * src/bytecode.c (exec_byte_code): * src/callint.c (Ffuncall_interactively, Fcall_interactively): * src/callproc.c (Fcall_process, call_process, create_temp_file) (Fcall_process_region): * src/charset.c (load_charset_map_from_file): * src/coding.c (decode_coding_gap, decode_coding_object) (encode_coding_object, Fread_coding_system): * src/comp.c (emit_static_object, helper_unbind_n, load_comp_unit): * src/composite.c (update_compositions, autocmp_chars): * src/cygw32.c (conv_filename_to_w32_unicode) (conv_filename_from_w32_unicode): * src/data.c (notify_variable_watchers): * src/decompress.c (Fzlib_decompress_region): * src/dired.c (directory_files_internal, file_name_completion) (file_attributes): * src/dispnew.c (Fredisplay): * src/doc.c (get_doc_string, Fsnarf_documentation): * src/editfns.c (Fsave_excursion, Fsave_current_buffer) (Freplace_buffer_contents, Fsubst_char_in_region, Fsave_restriction) (styled_format): * src/emacs-module.c (Fmodule_load, funcall_module): * src/emacs.c (init_cmdargs, Fdump_emacs): * src/eval.c (call_debugger, do_debug_on_call, FletX, Flet) (Ffuncall_with_delayed_message, Funwind_protect) (internal_lisp_condition_case, signal_or_quit) (load_with_autoload_queue, Feval, grow_specpdl_allocation) (record_in_backtrace, eval_sub, Ffuncall, apply_lambda) (funcall_lambda, clear_unwind_protect, set_unwind_protect) (set_unwind_protect_ptr, unbind_to, Fbacktrace_eval): * src/fileio.c (Fmake_temp_file_internal, Fcopy_file, Frename_file) (Finsert_file_contents, write_region, Fdo_auto_save): * src/fns.c (Fyes_or_no_p, Frequire, hash_table_user_defined_call): * src/fringe.c (update_window_fringes): * src/gtkutil.c (xg_dialog_run): * src/haiku_io.c (c_specpdl_idx_from_cxx): * src/haiku_support.cc (be_popup_file_dialog): * src/haiku_support.h (c_specpdl_idx_from_cxx): * src/haikufns.c (haiku_create_frame, haiku_create_tip_frame) (haiku_hide_tip, Fx_show_tip, Fhaiku_read_file_name): * src/haikumenu.c (haiku_popup_dialog, set_frame_menubar): * src/image.c (slurp_file): * src/indent.c (line_number_display_width, Fvertical_motion): * src/insdel.c (signal_before_change, signal_after_change) (Fcombine_after_change_execute): * src/intervals.c (get_local_map): * src/json.c (lisp_to_json_nonscalar_1, Fjson_serialize, Fjson_insert) (Fjson_parse_string, Fjson_parse_buffer): * src/keyboard.c (recursive_edit_1, Frecursive_edit, cmd_error) (Finternal_track_mouse, command_loop_1, read_menu_command) (safe_run_hooks, read_event_from_main_queue, read_char, timer_check_2) (menu_item_eval_property, read_key_sequence, read_key_sequence_vs) (Fsuspend_emacs): * src/keymap.c (Fcurrent_active_maps, Fdescribe_vector) (Fhelp__describe_vector): * src/lread.c (Fload, save_match_data_load, readevalloop) (Feval_buffer, Feval_region, grow_read_buffer, read_integer, read1): * src/macros.c (Fexecute_kbd_macro): * src/menu.c (x_popup_menu_1): * src/minibuf.c (read_minibuf, set_minibuffer_mode) (read_minibuf_unwind, Fread_string, Fread_buffer): * src/nsfns.m (Fx_create_frame, Fx_show_tip): * src/nsmenu.m (ns_update_menubar, ns_menu_show, ns_popup_dialog): * src/pdumper.c (Fdump_emacs_portable): * src/pgtkfns.c (Fx_create_frame, x_create_tip_frame, x_hide_tip) (Fx_show_tip, Fpgtk_print_frames_dialog, Fx_file_dialog, Fx_select_font): * src/pgtkmenu.c (set_frame_menubar, create_and_show_popup_menu) (pgtk_menu_show, create_and_show_dialog, pgtk_dialog_show) (pgtk_popup_dialog): * src/pgtkterm.c (pgtk_cr_export_frames): * src/print.c (PRINTPREPARE, temp_output_buffer_setup) (Fprin1_to_string, print_vectorlike): * src/process.c (Fmake_process, create_process, Fmake_pipe_process) (Fmake_serial_process, connect_network_socket, Fmake_network_process) (network_interface_info, server_accept_connection) (wait_reading_process_output, read_process_output, exec_sentinel): * src/regex-emacs.c (re_match_2_internal): * src/search.c (looking_at_1, fast_looking_at, search_buffer_re): * src/sound.c (Fplay_sound_internal): * src/sysdep.c (system_process_attributes): * src/term.c (tty_menu_show): * src/textprop.c (Fnext_single_char_property_change) (Fprevious_single_char_property_change, add_text_properties_1) (set_text_properties, set_text_properties_1, Fremove_text_properties) (Fremove_list_of_text_properties): * src/thread.c (Fmutex_lock, invoke_thread_function): * src/undo.c (truncate_undo_list): * src/w32fns.c (Fx_create_frame, w32_create_tip_frame, w32_hide_tip) (Fx_show_tip, Fx_file_dialog): * src/w32font.c (Fx_select_font): * src/w32menu.c (set_frame_menubar): * src/window.c (window_list, next_window, window_list_1) (run_window_configuration_change_hook, Frun_window_scroll_functions) (run_window_change_functions, set_window_buffer) (temp_output_buffer_show, window_scroll, scroll_command) (Fscroll_other_window, Fscroll_other_window_down): * src/xdisp.c (safe__call, handle_fontified_prop, handle_face_prop) (handle_single_display_spec, Fbuffer_text_pixel_size) (message_dolog, with_echo_area_buffer, setup_echo_area_for_printing) (display_echo_area, set_message, clear_message, echo_area_display) (gui_consider_frame_title, prepare_menu_bars, update_menu_bar) (update_tab_bar, update_tool_bar, redisplay_internal) (redisplay_preserve_echo_area, run_window_scroll_functions) (redisplay_window, extend_face_to_end_of_line) (display_count_lines_logically, display_count_lines_visually) (display_mode_lines, display_mode_line, Fformat_mode_line) (decode_mode_spec): * src/xfns.c (Fx_create_frame, x_create_tip_frame, x_hide_tip) (Fx_show_tip, Fx_file_dialog, Fx_select_font, Fx_print_frames_dialog): * src/xmenu.c (set_frame_menubar, create_and_show_popup_menu) (x_menu_show, create_and_show_dialog, x_dialog_show) (xw_popup_dialog): * src/xselect.c (x_get_local_selection, x_reply_selection_request) (x_handle_selection_request, wait_for_property_change): * src/xterm.c (x_cr_export_frames, x_connection_closed): Replace ptrdiff_t with specpdl_ref for referencing specpdl and use the corresponding functions instead of direct arithmetic.
349 lines
9 KiB
C
349 lines
9 KiB
C
/* Interface to zlib.
|
||
Copyright (C) 2013-2022 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 <https://www.gnu.org/licenses/>. */
|
||
|
||
#include <config.h>
|
||
|
||
#ifdef HAVE_ZLIB
|
||
|
||
#include <zlib.h>
|
||
|
||
#include "lisp.h"
|
||
#include "buffer.h"
|
||
#include "composite.h"
|
||
#include "md5.h"
|
||
|
||
#include <verify.h>
|
||
|
||
#ifdef WINDOWSNT
|
||
# include <windows.h>
|
||
# include "w32common.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);
|
||
|
||
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 */
|
||
|
||
|
||
|
||
#define MD5_BLOCKSIZE 32768 /* From md5.c */
|
||
|
||
static char acc_buff[2 * MD5_BLOCKSIZE];
|
||
static size_t acc_size;
|
||
|
||
static void
|
||
accumulate_and_process_md5 (void *data, size_t len, struct md5_ctx *ctxt)
|
||
{
|
||
eassert (len <= MD5_BLOCKSIZE);
|
||
/* We may optimize this saving some of these memcpy/move using
|
||
directly the outer buffers but so far don't bother. */
|
||
memcpy (acc_buff + acc_size, data, len);
|
||
acc_size += len;
|
||
if (acc_size >= MD5_BLOCKSIZE)
|
||
{
|
||
acc_size -= MD5_BLOCKSIZE;
|
||
md5_process_block (acc_buff, MD5_BLOCKSIZE, ctxt);
|
||
memmove (acc_buff, acc_buff + MD5_BLOCKSIZE, acc_size);
|
||
}
|
||
}
|
||
|
||
static void
|
||
final_process_md5 (struct md5_ctx *ctxt)
|
||
{
|
||
if (acc_size)
|
||
{
|
||
md5_process_bytes (acc_buff, acc_size, ctxt);
|
||
acc_size = 0;
|
||
}
|
||
}
|
||
|
||
int
|
||
md5_gz_stream (FILE *source, void *resblock)
|
||
{
|
||
z_stream stream;
|
||
unsigned char in[MD5_BLOCKSIZE];
|
||
unsigned char out[MD5_BLOCKSIZE];
|
||
|
||
#ifdef WINDOWSNT
|
||
if (!zlib_initialized)
|
||
zlib_initialized = init_zlib_functions ();
|
||
if (!zlib_initialized)
|
||
{
|
||
message1 ("zlib library not found");
|
||
return -1;
|
||
}
|
||
#endif
|
||
|
||
eassert (!acc_size);
|
||
|
||
struct md5_ctx ctx;
|
||
md5_init_ctx (&ctx);
|
||
|
||
/* allocate inflate state */
|
||
stream.zalloc = Z_NULL;
|
||
stream.zfree = Z_NULL;
|
||
stream.opaque = Z_NULL;
|
||
stream.avail_in = 0;
|
||
stream.next_in = Z_NULL;
|
||
int res = inflateInit2 (&stream, MAX_WBITS + 32);
|
||
if (res != Z_OK)
|
||
return -1;
|
||
|
||
do {
|
||
stream.avail_in = fread (in, 1, MD5_BLOCKSIZE, source);
|
||
if (ferror (source)) {
|
||
inflateEnd (&stream);
|
||
return -1;
|
||
}
|
||
if (stream.avail_in == 0)
|
||
break;
|
||
stream.next_in = in;
|
||
|
||
do {
|
||
stream.avail_out = MD5_BLOCKSIZE;
|
||
stream.next_out = out;
|
||
res = inflate (&stream, Z_NO_FLUSH);
|
||
|
||
if (res != Z_OK && res != Z_STREAM_END)
|
||
return -1;
|
||
|
||
accumulate_and_process_md5 (out, MD5_BLOCKSIZE - stream.avail_out, &ctx);
|
||
} while (!stream.avail_out);
|
||
|
||
} while (res != Z_STREAM_END);
|
||
|
||
final_process_md5 (&ctx);
|
||
inflateEnd (&stream);
|
||
|
||
if (res != Z_STREAM_END)
|
||
return -1;
|
||
|
||
md5_finish_ctx (&ctx, resblock);
|
||
|
||
return 0;
|
||
}
|
||
#undef MD5_BLOCKSIZE
|
||
|
||
|
||
|
||
struct decompress_unwind_data
|
||
{
|
||
ptrdiff_t old_point, orig, 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, but
|
||
without calling the change hooks. */
|
||
if (data->start)
|
||
{
|
||
del_range_2 (data->start, data->start, /* byte, char offsets the same */
|
||
data->start + data->nbytes, data->start + data->nbytes,
|
||
0);
|
||
update_compositions (data->start, data->start, CHECK_HEAD);
|
||
/* "Balance" the before-change-functions call, which would
|
||
otherwise be left "hanging". */
|
||
signal_after_change (data->orig, data->start - data->orig,
|
||
data->start - data->orig);
|
||
}
|
||
/* 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, 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, status), Vlibrary_cache);
|
||
return status;
|
||
}
|
||
#else
|
||
return Qt;
|
||
#endif
|
||
}
|
||
|
||
DEFUN ("zlib-decompress-region", Fzlib_decompress_region,
|
||
Szlib_decompress_region,
|
||
2, 3, 0,
|
||
doc: /* Decompress a gzip- or zlib-compressed region.
|
||
Replace the text in the region by the decompressed data.
|
||
|
||
If optional parameter ALLOW-PARTIAL is nil or omitted, then on
|
||
failure, return nil and leave the data in place. Otherwise, return
|
||
the number of bytes that were not decompressed and replace the region
|
||
text by whatever data was successfully decompressed (similar to gzip).
|
||
If decompression is completely successful return t.
|
||
|
||
This function can be called only in unibyte buffers. */)
|
||
(Lisp_Object start, Lisp_Object end, Lisp_Object allow_partial)
|
||
{
|
||
ptrdiff_t istart, iend, pos_byte;
|
||
z_stream stream;
|
||
int inflate_status;
|
||
struct decompress_unwind_data unwind_data;
|
||
specpdl_ref 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 = XFIXNUM (start);
|
||
iend = XFIXNUM (end);
|
||
|
||
/* Do the following before manipulating the gap. */
|
||
modify_text (istart, iend);
|
||
|
||
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.orig = istart;
|
||
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;
|
||
maybe_quit ();
|
||
}
|
||
while (inflate_status == Z_OK);
|
||
|
||
Lisp_Object ret = Qt;
|
||
if (inflate_status != Z_STREAM_END)
|
||
{
|
||
if (!NILP (allow_partial))
|
||
ret = make_int (iend - pos_byte);
|
||
else
|
||
return unbind_to (count, Qnil);
|
||
}
|
||
|
||
unwind_data.start = 0;
|
||
|
||
/* Delete the compressed data. */
|
||
del_range_2 (istart, istart, /* byte and char offsets are the same */
|
||
iend, iend, 0);
|
||
|
||
signal_after_change (istart, iend - istart, unwind_data.nbytes);
|
||
update_compositions (istart, istart, CHECK_HEAD);
|
||
|
||
return unbind_to (count, ret);
|
||
}
|
||
|
||
|
||
/***********************************************************************
|
||
Initialization
|
||
***********************************************************************/
|
||
void
|
||
syms_of_decompress (void)
|
||
{
|
||
defsubr (&Szlib_decompress_region);
|
||
defsubr (&Szlib_available_p);
|
||
}
|
||
|
||
#endif /* HAVE_ZLIB */
|