mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-31 09:20:54 -08:00
This also lessens the need to write wrappers for callbacks, and the need for make_save_pointer. * alloca.c (free_save_value): * atimer.c (run_all_atimers): Now extern. * alloc.c (safe_alloca_unwind): * atimer.c (unwind_stop_other_atimers): * keyboard.c (cancel_hourglass_unwind) [HAVE_WINDOW_SYSTEM]: * menu.c (cleanup_popup_menu) [HAVE_NS]: * minibuf.c (choose_minibuf_frame_1): * process.c (make_serial_process_unwind): * xdisp.h (pop_message_unwind): * xselect.c (queue_selection_requests_unwind): Remove no-longer-needed wrapper. All uses replaced by the wrappee. * alloca.c (record_xmalloc): Prefer record_unwind_protect_ptr to record_unwind_protect with make_save_pointer. * alloca.c (Fgarbage_collect): Prefer record_unwind_protect_void to passing a dummy. * buffer.c (restore_buffer): * window.c (restore_window_configuration): * xfns.c, w32fns.c (do_unwind_create_frame) New wrapper. All record-unwind uses of wrappee changed. * buffer.c (set_buffer_if_live): * callproc.c (call_process_cleanup, delete_temp_file): * coding.c (code_conversion_restore): * dired.c (directory_files_internal_w32_unwind) [WINDOWSNT]: * editfns.c (save_excursion_restore) (subst_char_in_region_unwind, subst_char_in_region_unwind_1) (save_restriction_restore): * eval.c (restore_stack_limits, un_autoload): * fns.c (require_unwind): * keyboard.c (recursive_edit_unwind, tracking_off): * lread.c (record_load_unwind, load_warn_old_style_backquotes): * macros.c (pop_kbd_macro, restore_menu_items): * nsfns.m (unwind_create_frame): * print.c (print_unwind): * process.c (start_process_unwind): * search.c (unwind_set_match_data): * window.c (select_window_norecord, select_frame_norecord): * xdisp.c (unwind_with_echo_area_buffer, unwind_format_mode_line) (fast_set_selected_frame): * xfns.c, w32fns.c (unwind_create_tip_frame): Return void, not a dummy Lisp_Object. All uses changed. * buffer.h (set_buffer_if_live): Move decl here from lisp.h. * callproc.c (call_process_kill): * fileio.c (restore_point_unwind, decide_coding_unwind) (build_annotations_unwind): * insdel.c (Fcombine_after_change_execute_1): * keyboard.c (read_char_help_form_unwind): * menu.c (unuse_menu_items): * minibuf.c (run_exit_minibuf_hook, read_minibuf_unwind): * sound.c (sound_cleanup): * xdisp.c (unwind_redisplay): * xfns.c (clean_up_dialog): * xselect.c (x_selection_request_lisp_error, x_catch_errors_unwind): Accept no args and return void, instead of accepting and returning a dummy Lisp_Object. All uses changed. * cygw32.c (fchdir_unwind): * fileio.c (close_file_unwind): * keyboard.c (restore_kboard_configuration): * lread.c (readevalllop_1): * process.c (wait_reading_process_output_unwind): Accept int and return void, rather than accepting an Emacs integer and returning a dummy object. In some cases this fixes an unlikely bug when the corresponding int is outside Emacs integer range. All uses changed. * dired.c (directory_files_internal_unwind): * fileio.c (do_auto_save_unwind): * gtkutil.c (pop_down_dialog): * insdel.c (reset_var_on_error): * lread.c (load_unwind): * xfns.c (clean_up_file_dialog): * xmenu.c, nsmenu.m (pop_down_menu): * xmenu.c (cleanup_widget_value_tree): * xselect.c (wait_for_property_change_unwind): Accept pointer and return void, rather than accepting an Emacs save value encapsulating the pointer and returning a dummy object. All uses changed. * editfns.c (Fformat): Update the saved pointer directly via set_unwind_protect_ptr rather than indirectly via make_save_pointer. * eval.c (specpdl_func): Remove. All uses replaced by definiens. (unwind_body): New function. (record_unwind_protect): First arg is now a function returning void, not a dummy Lisp_Object. (record_unwind_protect_ptr, record_unwind_protect_int) (record_unwind_protect_void): New functions. (unbind_to): Support SPECPDL_UNWIND_PTR etc. * fileio.c (struct auto_save_unwind): New type. (do_auto_save_unwind): Use it. (do_auto_save_unwind_1): Remove; subsumed by new do_auto_save_unwind. * insdel.c (struct rvoe_arg): New type. (reset_var_on_error): Use it. * lisp.h (SPECPDL_UNWIND_PTR, SPECPDL_UNWIND_INT, SPECPDL_UNWIND_VOID): New constants. (specbinding_func): Remove; there are now several such functions. (union specbinding): New members unwind_ptr, unwind_int, unwind_void. (set_unwind_protect_ptr): New function. * xselect.c: Remove unnecessary forward decls, to simplify maintenance.
139 lines
4 KiB
C
139 lines
4 KiB
C
/* Cygwin support routines.
|
|
Copyright (C) 2011-2013 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 "cygw32.h"
|
|
#include "character.h"
|
|
#include "buffer.h"
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
static void
|
|
fchdir_unwind (int dir_fd)
|
|
{
|
|
(void) fchdir (dir_fd);
|
|
(void) close (dir_fd);
|
|
}
|
|
|
|
static void
|
|
chdir_to_default_directory ()
|
|
{
|
|
Lisp_Object new_cwd;
|
|
int old_cwd_fd = emacs_open (".", O_RDONLY | O_DIRECTORY, 0);
|
|
|
|
if (old_cwd_fd == -1)
|
|
error ("could not open current directory: %s", strerror (errno));
|
|
|
|
record_unwind_protect_int (fchdir_unwind, old_cwd_fd);
|
|
|
|
new_cwd = Funhandled_file_name_directory (
|
|
Fexpand_file_name (build_string ("."), Qnil));
|
|
if (!STRINGP (new_cwd))
|
|
new_cwd = build_string ("/");
|
|
|
|
if (chdir (SDATA (ENCODE_FILE (new_cwd))))
|
|
error ("could not chdir: %s", strerror (errno));
|
|
}
|
|
|
|
static Lisp_Object
|
|
conv_filename_to_w32_unicode (Lisp_Object in, int absolute_p)
|
|
{
|
|
ssize_t converted_len;
|
|
Lisp_Object converted;
|
|
unsigned flags;
|
|
int count = SPECPDL_INDEX ();
|
|
|
|
chdir_to_default_directory ();
|
|
|
|
flags = CCP_POSIX_TO_WIN_W;
|
|
if (!absolute_p) {
|
|
flags |= CCP_RELATIVE;
|
|
}
|
|
|
|
in = ENCODE_FILE (in);
|
|
|
|
converted_len = cygwin_conv_path (flags, SDATA (in), NULL, 0);
|
|
if (converted_len < 2)
|
|
error ("cygwin_conv_path: %s", strerror (errno));
|
|
|
|
converted = make_uninit_string (converted_len - 1);
|
|
if (cygwin_conv_path (flags, SDATA (in),
|
|
SDATA (converted), converted_len))
|
|
error ("cygwin_conv_path: %s", strerror (errno));
|
|
|
|
return unbind_to (count, converted);
|
|
}
|
|
|
|
static Lisp_Object
|
|
conv_filename_from_w32_unicode (const wchar_t* in, int absolute_p)
|
|
{
|
|
ssize_t converted_len;
|
|
Lisp_Object converted;
|
|
unsigned flags;
|
|
int count = SPECPDL_INDEX ();
|
|
|
|
chdir_to_default_directory ();
|
|
|
|
flags = CCP_WIN_W_TO_POSIX;
|
|
if (!absolute_p) {
|
|
flags |= CCP_RELATIVE;
|
|
}
|
|
|
|
converted_len = cygwin_conv_path (flags, in, NULL, 0);
|
|
if (converted_len < 1)
|
|
error ("cygwin_conv_path: %s", strerror (errno));
|
|
|
|
converted = make_uninit_string (converted_len - 1 /*subtract terminator*/);
|
|
if (cygwin_conv_path (flags, in, SDATA (converted), converted_len))
|
|
error ("cygwin_conv_path: %s", strerror (errno));
|
|
|
|
return unbind_to (count, DECODE_FILE (converted));
|
|
}
|
|
|
|
DEFUN ("cygwin-convert-file-name-to-windows",
|
|
Fcygwin_convert_file_name_to_windows,
|
|
Scygwin_convert_file_name_to_windows,
|
|
1, 2, 0,
|
|
doc: /* Convert a Cygwin file name FILE to a Windows-style file name.
|
|
If ABSOLUTE-P is non-nil, return an absolute file name.
|
|
For the reverse operation, see `cygwin-convert-file-name-from-windows'. */)
|
|
(Lisp_Object file, Lisp_Object absolute_p)
|
|
{
|
|
return from_unicode (
|
|
conv_filename_to_w32_unicode (file, EQ (absolute_p, Qnil) ? 0 : 1));
|
|
}
|
|
|
|
DEFUN ("cygwin-convert-file-name-from-windows",
|
|
Fcygwin_convert_file_name_from_windows,
|
|
Scygwin_convert_file_name_from_windows,
|
|
1, 2, 0,
|
|
doc: /* Convert a Windows-style file name FILE to a Cygwin file name.
|
|
If ABSOLUTE-P is non-nil, return an absolute file name.
|
|
For the reverse operation, see `cygwin-convert-file-name-to-windows'. */)
|
|
(Lisp_Object file, Lisp_Object absolute_p)
|
|
{
|
|
return conv_filename_from_w32_unicode (to_unicode (file, &file),
|
|
EQ (absolute_p, Qnil) ? 0 : 1);
|
|
}
|
|
|
|
void
|
|
syms_of_cygw32 (void)
|
|
{
|
|
defsubr (&Scygwin_convert_file_name_from_windows);
|
|
defsubr (&Scygwin_convert_file_name_to_windows);
|
|
}
|