diff options
| author | Po Lu | 2022-12-31 18:04:18 +0800 |
|---|---|---|
| committer | Po Lu | 2022-12-31 18:04:18 +0800 |
| commit | cfbc8a5dbcd362b69b37b4e6832ae4a31834364c (patch) | |
| tree | ce003d03c4ae98f4e1d02186d78e5ae6e0d36e55 /src/sysdep.c | |
| parent | 785095c416f9bae43d2947849282b814e2c7942e (diff) | |
| download | emacs-cfbc8a5dbcd362b69b37b4e6832ae4a31834364c.tar.gz emacs-cfbc8a5dbcd362b69b37b4e6832ae4a31834364c.zip | |
Bring up the Android operating system and its window system
* .dir-locals.el (c-mode): Add ANDROID_EXPORT noise macro.
* .gitignore: Add new files to ignore.
* Makefile.in: Adjust for Android.
* admin/merge-gnulib: Add new warning.
* configure.ac: Detect Android. Run cross-configuration for
Android when appropriate.
* etc/DEBUG: Document how to debug Emacs on Android.
* java/AndroidManifest.xml:
* java/Makefile.in:
* java/README:
* java/debug.sh:
* java/org/gnu/emacs/EmacsActivity.java (EmacsActivity):
* java/org/gnu/emacs/EmacsApplication.java (EmacsApplication):
* java/org/gnu/emacs/EmacsCopyArea.java (EmacsCopyArea):
* java/org/gnu/emacs/EmacsDrawLine.java (EmacsDrawLine):
* java/org/gnu/emacs/EmacsDrawPoint.java (EmacsDrawPoint):
* java/org/gnu/emacs/EmacsDrawRectangle.java
(EmacsDrawRectangle):
* java/org/gnu/emacs/EmacsDrawable.java (EmacsDrawable):
* java/org/gnu/emacs/EmacsFillPolygon.java (EmacsFillPolygon):
* java/org/gnu/emacs/EmacsFillRectangle.java
(EmacsFillRectangle):
* java/org/gnu/emacs/EmacsFontDriver.java (EmacsFontDriver):
* java/org/gnu/emacs/EmacsGC.java (EmacsGC):
* java/org/gnu/emacs/EmacsHandleObject.java (EmacsHandleObject):
* java/org/gnu/emacs/EmacsNative.java (EmacsNative):
* java/org/gnu/emacs/EmacsPaintQueue.java (EmacsPaintQueue):
* java/org/gnu/emacs/EmacsPaintReq.java (EmacsPaintReq):
* java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java
(EmacsSdk7FontDriver):
* java/org/gnu/emacs/EmacsService.java (class Holder<T>)
(EmacsService):
* java/org/gnu/emacs/EmacsSurfaceView.java (EmacsSurfaceView):
* java/org/gnu/emacs/EmacsThread.java (EmacsThread):
* java/org/gnu/emacs/EmacsView.java (EmacsView):
* java/org/gnu/emacs/EmacsWindow.java (EmacsWindow): New files
and classes.
* lib-src/Makefile.in (srcdir):
* lib/Makefile.in (VPATH):
(HAVE_NATIVE_COMP):
(libgnu_a_SOURCES):
(DEPFLAGS): Configure correctly for cross-compiling.
* lib/faccessat.c:
* lib/fpending.c (__fpending):
* lib/open.c:
* lib/unistd.c (_GL_UNISTD_INLINE): Temporary adjustments to
gnulib.
* lisp/frame.el (display-graphic-p):
(display-screens):
(display-pixel-height):
(display-pixel-width):
(display-mm-height):
(display-mm-width):
(display-backing-store):
(display-save-under):
(display-planes):
(display-color-cells):
(display-visual-class): Adjust for new window system `android'.
* lisp/image/wallpaper.el (x-open-connection): Add declaration.
* lisp/loadup.el (featurep): Load up files for Android.
* lisp/net/eww.el (eww-form-submit, eww-form-file)
(eww-form-checkbox, eww-form-select): Adjust faces for android.
* lisp/term/android-win.el: New file.
* src/Makefile.in: Add new targets emacs.so and android-emacs,
then adjust for cross compilation.
* src/alloc.c (cleanup_vector): Clean up Android font entities
as well.
(garbage_collect): Mark androidterm.
* src/android-emacs.c (main):
* src/android.c (ANDROID_THROW, enum android_fd_table_entry_flags)
(struct android_emacs_service, struct android_emacs_pixmap)
(struct android_graphics_point, struct android_event_container)
(struct android_event_queue, android_run_select_thread)
(android_handle_sigusr1, android_init_events, android_pending)
(android_next_event, android_write_event, android_select)
(android_run_debug_thread, android_user_full_name)
(android_get_asset_name, android_fstat, android_fstatat)
(android_file_access_p, android_hack_asset_fd, android_open)
(android_close, JNICALL, android_init_emacs_service)
(android_init_emacs_pixmap, android_init_graphics_point)
(MAX_HANDLE, struct android_handle_entry, android_alloc_id)
(android_destroy_handle, android_resolve_handle)
(android_resolve_handle2, android_change_window_attributes)
(android_create_window, android_set_window_background)
(android_destroy_window, android_init_android_rect_class)
(android_init_emacs_gc_class, android_create_gc, android_free_gc)
(android_change_gc, android_set_clip_rectangles)
(android_reparent_window, android_lookup_method)
(android_clear_window, android_map_window, android_unmap_window)
(android_resize_window, android_move_window, android_swap_buffers)
(android_get_gc_values, android_set_foreground)
(android_fill_rectangle, android_create_pixmap_from_bitmap_data)
(android_set_clip_mask, android_set_fill_style, android_copy_area)
(android_free_pixmap, android_set_background, android_fill_polygon)
(android_draw_rectangle, android_draw_point, android_draw_line)
(android_create_pixmap, android_set_ts_origin, android_clear_area):
* src/android.h (ANDROID_EXPORT):
* src/androidfns.c (android_display_info_for_name)
(check_android_display_info, check_x_display_info, gamma_correct)
(android_defined_color, android_decode_color)
(android_implicitly_set_name, android_explicitly_set_name)
(android_set_tool_bar_lines, android_change_tool_bar_height)
(android_set_tab_bar_lines, android_change_tab_bar_height)
(android_set_scroll_bar_default_height)
(android_set_scroll_bar_default_width, android_icon_verify)
(android_icon, android_make_gc, android_free_gcs)
(unwind_create_frame, do_unwind_create_frame)
(android_default_font_parameter, android_create_frame_window)
(Fx_create_frame, Fxw_color_defined_p, Fxw_color_values)
(Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells, Fx_display_screens)
(Fx_display_mm_width, Fx_display_mm_height)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_monitor_attributes_list, Fx_frame_geometry)
(Fx_frame_list_z_order, Fx_frame_restack)
(Fx_mouse_absolute_pixel_position)
(Fx_set_mouse_absolute_pixel_position, Fandroid_get_connection)
(Fx_display_list, Fx_show_tip, Fx_hide_tip)
(android_set_background_color, android_set_border_color)
(android_set_cursor_color, android_set_cursor_type)
(android_set_foreground_color)
(android_set_child_frame_border_width)
(android_set_internal_border_width, android_set_menu_bar_lines)
(android_set_mouse_color, android_set_title, android_set_alpha)
(android_frame_parm_handlers, syms_of_androidfns):
* src/androidfont.c (struct android_emacs_font_driver)
(struct android_emacs_font_spec, struct android_emacs_font_metrics)
(struct android_emacs_font_object, struct android_integer)
(struct androidfont_info, struct androidfont_entity)
(android_init_font_driver, android_init_font_spec)
(android_init_font_metrics, android_init_integer)
(android_init_font_object, androidfont_get_cache)
(androidfont_from_lisp, androidfont_from_java, androidfont_list)
(androidfont_match, androidfont_draw, androidfont_open_font)
(androidfont_close_font, androidfont_has_char)
(androidfont_encode_char, androidfont_text_extents)
(androidfont_list_family, androidfont_driver)
(syms_of_androidfont_for_pdumper, syms_of_androidfont)
(init_androidfont, android_finalize_font_entity):
* src/androidgui.h (_ANDROID_GUI_H_, struct android_rectangle)
(struct android_point, enum android_gc_function)
(enum android_gc_value_mask, enum android_fill_style)
(enum android_window_value_mask)
(struct android_set_window_attributes, struct android_gc_values)
(struct android_gc, enum android_swap_action, enum android_shape)
(enum android_coord_mode, struct android_swap_info)
(NativeRectangle, struct android_any_event)
(struct android_key_event, struct android_configure_event)
(union android_event):
* src/androidterm.c (android_window_to_frame, android_clear_frame)
(android_ring_bell, android_toggle_invisible_pointer)
(android_update_begin, android_update_end, show_back_buffer)
(android_flush_dirty_back_buffer_on, handle_one_android_event)
(android_read_socket, android_frame_up_to_date)
(android_buffer_flipping_unblocked_hook)
(android_query_frame_background_color, android_parse_color)
(android_alloc_nearest_color, android_query_colors)
(android_mouse_position, android_get_focus_frame)
(android_focus_frame, android_frame_rehighlight)
(android_frame_raise_lower, android_make_frame_visible)
(android_make_frame_invisible)
(android_make_frame_visible_invisible, android_fullscreen_hook)
(android_iconify_frame, android_set_window_size_1)
(android_set_window_size, android_set_offset, android_set_alpha)
(android_new_font, android_bitmap_icon, android_free_pixmap_hook)
(android_free_frame_resources, android_delete_frame)
(android_delete_terminal, android_scroll_run)
(android_after_update_window_line, android_flip_and_flush)
(android_clear_rectangle, android_reset_clip_rectangles)
(android_clip_to_row, android_draw_fringe_bitmap)
(android_set_cursor_gc, android_set_mouse_face_gc)
(android_set_mode_line_face_gc, android_set_glyph_string_gc)
(android_set_glyph_string_clipping)
(android_set_glyph_string_clipping_exactly)
(android_compute_glyph_string_overhangs)
(android_clear_glyph_string_rect)
(android_draw_glyph_string_background, android_fill_triangle)
(android_make_point, android_inside_rect_p, android_clear_point)
(android_draw_relief_rect, android_draw_box_rect)
(HIGHLIGHT_COLOR_DARK_BOOST_LIMIT, android_setup_relief_color)
(android_setup_relief_colors, android_draw_glyph_string_box)
(android_draw_glyph_string_bg_rect, android_draw_image_relief)
(android_draw_image_foreground, android_draw_image_foreground_1)
(android_draw_image_glyph_string)
(android_draw_stretch_glyph_string, android_draw_underwave)
(android_draw_glyph_string_foreground)
(android_draw_composite_glyph_string_foreground)
(android_draw_glyphless_glyph_string_foreground)
(android_draw_glyph_string, android_define_frame_cursor)
(android_clear_frame_area, android_clear_under_internal_border)
(android_draw_hollow_cursor, android_draw_bar_cursor)
(android_draw_window_cursor, android_draw_vertical_window_border)
(android_draw_window_divider, android_redisplay_interface)
(frame_set_mouse_pixel_position, get_keysym_name)
(android_create_terminal, android_term_init, syms_of_androidterm)
(mark_androidterm):
* src/androidterm.h (_ANDROID_TERM_H_, struct android_display_info)
(struct android_output, FRAME_ANDROID_OUTPUT, XSCROLL_BAR): New
files.
* src/dired.c (file_attributes): Do not use openat on Android.
* src/dispextern.h (No_Cursor): Define appropriately on Android.
(struct glyph_string, struct face): Make gc field of type struct
android_gc on Android.
* src/dispnew.c (clear_current_matrices, clear_desired_matrices)
(adjust_frame_glyphs_for_window_redisplay, free_glyphs)
(update_frame, scrolling, char_ins_del_cost, update_frame_line)
(init_display_interactive): Disable text terminal support
completely on Android. Fix non-toolkit menus for non-X systems.
* src/editfns.c (Fuser_full_name): Call android_user_full_name.
* src/emacs.c (android_emacs_init): Make main this on Android.
Prohibit argv sorting from exceeding end of argv.
* src/epaths.in: Add path definitions for Android.
* src/fileio.c (file_access_p): Call android_file_access_p.
(file_name_directory): Avoid using openat on Android.
(Fcopy_file): Adjust to call sys_fstat instead.
(file_directory_p):
(Finsert_file_contents):
(write_region): Likewise.
* src/filelock.c:
* src/fns.c (Flocale_info): Pacify warning on Android.
* src/font.c (font_make_entity_android): New function.
* src/font.h:
* src/frame.c (Fframep):
(Fwindow_system): Handle new window system `android'. Update doc strings.
(Fmake_terminal_frame): Disable on Android.
(gui_display_get_resource): Disable get_string_resource_hook on Android.
(syms_of_frame): New defsym `android'.
* src/frame.h (GCALIGNED_STRUCT): Add new output data for
Android.
(ENUM_BF): Expand enumerator size.
(FRAME_ANDROID_P, FRAME_WINDOW_P, MOUSE_HL_INFO): Add
definitions for Android.
* src/image.c (GET_PIXEL):
(image_create_bitmap_from_file):
(image_create_x_image_and_pixmap_1):
(image_get_x_image):
(slurp_file):
(lookup_rgb_color):
(image_to_emacs_colors):
(image_from_emacs_colors):
(image_pixmap_draw_cross):
(image_disable_image):
(MaskForeground):
(gif_load): Add stubs for Android.
* src/lisp.h:
* src/lread.c (safe_to_load_version, maybe_swap_for_eln1, openp):
* src/pdumper.c (pdumper_load): Call sys_fstat instead of fstat.
* src/process.c (wait_reading_process_output): Use
android_select instead of pselect.
* src/scroll.c: Disable on Android.
* src/sysdep.c (widen_foreground_group, reset_sys_modes)
(init_signals, emacs_fstatat, sys_fstat): New function.
(emacs_open, emacs_open_noquit, emacs_close): Implement
differently on Android.
(close_output_streams): Disable what is not required on Android.
* src/term.c (OUTPUT1_IF, encode_terminal_code, string_cost)
(string_cost_one_line, per_line_cost, calculate_costs)
(struct fkey_table, tty_append_glyph, produce_glyphs)
(tty_capable_p, Fsuspend_tty, Fresume_tty, device, init_tty)
(maybe_fatal, syms_of_term): Disable text terminal support on
Android.
* src/termhooks.h (enum output_method): Add android output
method.
(GCALIGNED_STRUCT, TERMINAL_FONT_CACHE): Define for Android.
* src/terminal.c (Fterminal_live_p): Implement for Android.
* src/verbose.mk.in (AM_V_GLOBALS): Add JAVAC and DX.
* src/xdisp.c (redisplay_internal): Disable text terminals on Android.
(display_menu_bar):
(display_tty_menu_item):
(draw_row_with_mouse_face):
(expose_frame): Make the non toolkit menu bar work on Android.
* src/xfaces.c (GCGraphicsExposures):
(x_create_gc):
(x_free_gc):
(Fx_load_color_file): Define for Android.
* xcompile/Makefile.in (top_srcdir):
(top_builddir):
* xcompile/README:
* xcompile/langinfo.h (nl_langinfo): New files.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 98 |
1 files changed, 95 insertions, 3 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 8402ffe308c..808c4af85f3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -134,6 +134,10 @@ int _cdecl _spawnlp (int, const char *, const char *, ...); | |||
| 134 | # include <sys/socket.h> | 134 | # include <sys/socket.h> |
| 135 | #endif | 135 | #endif |
| 136 | 136 | ||
| 137 | #ifdef HAVE_ANDROID | ||
| 138 | #include "android.h" | ||
| 139 | #endif | ||
| 140 | |||
| 137 | /* Declare here, including term.h is problematic on some systems. */ | 141 | /* Declare here, including term.h is problematic on some systems. */ |
| 138 | extern void tputs (const char *, int, int (*)(int)); | 142 | extern void tputs (const char *, int, int (*)(int)); |
| 139 | 143 | ||
| @@ -790,6 +794,7 @@ init_sigio (int fd) | |||
| 790 | #endif | 794 | #endif |
| 791 | } | 795 | } |
| 792 | 796 | ||
| 797 | #ifndef HAVE_ANDROID | ||
| 793 | #ifndef DOS_NT | 798 | #ifndef DOS_NT |
| 794 | #ifdef F_SETOWN | 799 | #ifdef F_SETOWN |
| 795 | static void | 800 | static void |
| @@ -801,6 +806,7 @@ reset_sigio (int fd) | |||
| 801 | } | 806 | } |
| 802 | #endif /* F_SETOWN */ | 807 | #endif /* F_SETOWN */ |
| 803 | #endif | 808 | #endif |
| 809 | #endif | ||
| 804 | 810 | ||
| 805 | void | 811 | void |
| 806 | request_sigio (void) | 812 | request_sigio (void) |
| @@ -972,6 +978,8 @@ narrow_foreground_group (int fd) | |||
| 972 | tcsetpgrp_without_stopping (fd, getpid ()); | 978 | tcsetpgrp_without_stopping (fd, getpid ()); |
| 973 | } | 979 | } |
| 974 | 980 | ||
| 981 | #ifndef HAVE_ANDROID | ||
| 982 | |||
| 975 | /* Set the tty to our original foreground group. */ | 983 | /* Set the tty to our original foreground group. */ |
| 976 | static void | 984 | static void |
| 977 | widen_foreground_group (int fd) | 985 | widen_foreground_group (int fd) |
| @@ -979,6 +987,9 @@ widen_foreground_group (int fd) | |||
| 979 | if (inherited_pgroup && setpgid (0, inherited_pgroup) == 0) | 987 | if (inherited_pgroup && setpgid (0, inherited_pgroup) == 0) |
| 980 | tcsetpgrp_without_stopping (fd, inherited_pgroup); | 988 | tcsetpgrp_without_stopping (fd, inherited_pgroup); |
| 981 | } | 989 | } |
| 990 | |||
| 991 | #endif | ||
| 992 | |||
| 982 | 993 | ||
| 983 | /* Getting and setting emacs_tty structures. */ | 994 | /* Getting and setting emacs_tty structures. */ |
| 984 | 995 | ||
| @@ -1496,6 +1507,8 @@ reset_sys_modes (struct tty_display_info *tty_out) | |||
| 1496 | fflush (stdout); | 1507 | fflush (stdout); |
| 1497 | return; | 1508 | return; |
| 1498 | } | 1509 | } |
| 1510 | |||
| 1511 | #ifndef HAVE_ANDROID | ||
| 1499 | if (!tty_out->term_initted) | 1512 | if (!tty_out->term_initted) |
| 1500 | return; | 1513 | return; |
| 1501 | 1514 | ||
| @@ -1552,6 +1565,7 @@ reset_sys_modes (struct tty_display_info *tty_out) | |||
| 1552 | #endif | 1565 | #endif |
| 1553 | 1566 | ||
| 1554 | widen_foreground_group (fileno (tty_out->input)); | 1567 | widen_foreground_group (fileno (tty_out->input)); |
| 1568 | #endif | ||
| 1555 | } | 1569 | } |
| 1556 | 1570 | ||
| 1557 | #ifdef HAVE_PTYS | 1571 | #ifdef HAVE_PTYS |
| @@ -1802,7 +1816,11 @@ handle_arith_signal (int sig) | |||
| 1802 | xsignal0 (Qarith_error); | 1816 | xsignal0 (Qarith_error); |
| 1803 | } | 1817 | } |
| 1804 | 1818 | ||
| 1805 | #if defined HAVE_STACK_OVERFLOW_HANDLING && !defined WINDOWSNT | 1819 | /* This does not work on Android and interferes with the system |
| 1820 | tombstone generation. */ | ||
| 1821 | |||
| 1822 | #if defined HAVE_STACK_OVERFLOW_HANDLING && !defined WINDOWSNT \ | ||
| 1823 | && (!defined HAVE_ANDROID || defined ANDROID_STUBIFY) | ||
| 1806 | 1824 | ||
| 1807 | /* Alternate stack used by SIGSEGV handler below. */ | 1825 | /* Alternate stack used by SIGSEGV handler below. */ |
| 1808 | 1826 | ||
| @@ -1914,12 +1932,16 @@ init_sigsegv (void) | |||
| 1914 | 1932 | ||
| 1915 | #else /* not HAVE_STACK_OVERFLOW_HANDLING or WINDOWSNT */ | 1933 | #else /* not HAVE_STACK_OVERFLOW_HANDLING or WINDOWSNT */ |
| 1916 | 1934 | ||
| 1935 | #if !defined HAVE_ANDROID || defined ANDROID_STUBIFY | ||
| 1936 | |||
| 1917 | static bool | 1937 | static bool |
| 1918 | init_sigsegv (void) | 1938 | init_sigsegv (void) |
| 1919 | { | 1939 | { |
| 1920 | return 0; | 1940 | return 0; |
| 1921 | } | 1941 | } |
| 1922 | 1942 | ||
| 1943 | #endif | ||
| 1944 | |||
| 1923 | #endif /* HAVE_STACK_OVERFLOW_HANDLING && !WINDOWSNT */ | 1945 | #endif /* HAVE_STACK_OVERFLOW_HANDLING && !WINDOWSNT */ |
| 1924 | 1946 | ||
| 1925 | static void | 1947 | static void |
| @@ -2020,12 +2042,17 @@ init_signals (void) | |||
| 2020 | sigaction (SIGFPE, &action, 0); | 2042 | sigaction (SIGFPE, &action, 0); |
| 2021 | } | 2043 | } |
| 2022 | 2044 | ||
| 2045 | /* SIGUSR1 and SIGUSR2 are used internally by the android_select | ||
| 2046 | function. */ | ||
| 2047 | #if !defined HAVE_ANDROID | ||
| 2023 | #ifdef SIGUSR1 | 2048 | #ifdef SIGUSR1 |
| 2024 | add_user_signal (SIGUSR1, "sigusr1"); | 2049 | add_user_signal (SIGUSR1, "sigusr1"); |
| 2025 | #endif | 2050 | #endif |
| 2026 | #ifdef SIGUSR2 | 2051 | #ifdef SIGUSR2 |
| 2027 | add_user_signal (SIGUSR2, "sigusr2"); | 2052 | add_user_signal (SIGUSR2, "sigusr2"); |
| 2028 | #endif | 2053 | #endif |
| 2054 | #endif | ||
| 2055 | |||
| 2029 | sigaction (SIGABRT, &thread_fatal_action, 0); | 2056 | sigaction (SIGABRT, &thread_fatal_action, 0); |
| 2030 | #ifdef SIGPRE | 2057 | #ifdef SIGPRE |
| 2031 | sigaction (SIGPRE, &thread_fatal_action, 0); | 2058 | sigaction (SIGPRE, &thread_fatal_action, 0); |
| @@ -2051,8 +2078,10 @@ init_signals (void) | |||
| 2051 | #ifdef SIGBUS | 2078 | #ifdef SIGBUS |
| 2052 | sigaction (SIGBUS, &thread_fatal_action, 0); | 2079 | sigaction (SIGBUS, &thread_fatal_action, 0); |
| 2053 | #endif | 2080 | #endif |
| 2081 | #if !defined HAVE_ANDROID || defined ANDROID_STUBIFY | ||
| 2054 | if (!init_sigsegv ()) | 2082 | if (!init_sigsegv ()) |
| 2055 | sigaction (SIGSEGV, &thread_fatal_action, 0); | 2083 | sigaction (SIGSEGV, &thread_fatal_action, 0); |
| 2084 | #endif | ||
| 2056 | #ifdef SIGSYS | 2085 | #ifdef SIGSYS |
| 2057 | sigaction (SIGSYS, &thread_fatal_action, 0); | 2086 | sigaction (SIGSYS, &thread_fatal_action, 0); |
| 2058 | #endif | 2087 | #endif |
| @@ -2328,11 +2357,20 @@ int | |||
| 2328 | emacs_fstatat (int dirfd, char const *filename, void *st, int flags) | 2357 | emacs_fstatat (int dirfd, char const *filename, void *st, int flags) |
| 2329 | { | 2358 | { |
| 2330 | int r; | 2359 | int r; |
| 2331 | while ((r = fstatat (dirfd, filename, st, flags)) != 0 && errno == EINTR) | 2360 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) |
| 2361 | while ((r = fstatat (dirfd, filename, st, flags)) != 0 | ||
| 2362 | && errno == EINTR) | ||
| 2363 | maybe_quit (); | ||
| 2364 | #else | ||
| 2365 | while ((r = android_fstatat (dirfd, filename, st, flags)) != 0 | ||
| 2366 | && errno == EINTR) | ||
| 2332 | maybe_quit (); | 2367 | maybe_quit (); |
| 2368 | #endif | ||
| 2333 | return r; | 2369 | return r; |
| 2334 | } | 2370 | } |
| 2335 | 2371 | ||
| 2372 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) | ||
| 2373 | |||
| 2336 | static int | 2374 | static int |
| 2337 | sys_openat (int dirfd, char const *file, int oflags, int mode) | 2375 | sys_openat (int dirfd, char const *file, int oflags, int mode) |
| 2338 | { | 2376 | { |
| @@ -2347,6 +2385,18 @@ sys_openat (int dirfd, char const *file, int oflags, int mode) | |||
| 2347 | #endif | 2385 | #endif |
| 2348 | } | 2386 | } |
| 2349 | 2387 | ||
| 2388 | #endif | ||
| 2389 | |||
| 2390 | int | ||
| 2391 | sys_fstat (int fd, struct stat *statb) | ||
| 2392 | { | ||
| 2393 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) | ||
| 2394 | return fstat (fd, statb); | ||
| 2395 | #else | ||
| 2396 | return android_fstat (fd, statb); | ||
| 2397 | #endif | ||
| 2398 | } | ||
| 2399 | |||
| 2350 | /* Assuming the directory DIRFD, open FILE for Emacs use, | 2400 | /* Assuming the directory DIRFD, open FILE for Emacs use, |
| 2351 | using open flags OFLAGS and mode MODE. | 2401 | using open flags OFLAGS and mode MODE. |
| 2352 | Use binary I/O on systems that care about text vs binary I/O. | 2402 | Use binary I/O on systems that care about text vs binary I/O. |
| @@ -2355,6 +2405,8 @@ sys_openat (int dirfd, char const *file, int oflags, int mode) | |||
| 2355 | Do not fail merely because the open was interrupted by a signal. | 2405 | Do not fail merely because the open was interrupted by a signal. |
| 2356 | Allow the user to quit. */ | 2406 | Allow the user to quit. */ |
| 2357 | 2407 | ||
| 2408 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) | ||
| 2409 | |||
| 2358 | int | 2410 | int |
| 2359 | emacs_openat (int dirfd, char const *file, int oflags, int mode) | 2411 | emacs_openat (int dirfd, char const *file, int oflags, int mode) |
| 2360 | { | 2412 | { |
| @@ -2367,10 +2419,23 @@ emacs_openat (int dirfd, char const *file, int oflags, int mode) | |||
| 2367 | return fd; | 2419 | return fd; |
| 2368 | } | 2420 | } |
| 2369 | 2421 | ||
| 2422 | #endif | ||
| 2423 | |||
| 2370 | int | 2424 | int |
| 2371 | emacs_open (char const *file, int oflags, int mode) | 2425 | emacs_open (char const *file, int oflags, int mode) |
| 2372 | { | 2426 | { |
| 2427 | #if defined HAVE_ANDROID && !defined ANDROID_STUBIFY | ||
| 2428 | int fd; | ||
| 2429 | #endif | ||
| 2430 | |||
| 2431 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) | ||
| 2373 | return emacs_openat (AT_FDCWD, file, oflags, mode); | 2432 | return emacs_openat (AT_FDCWD, file, oflags, mode); |
| 2433 | #else | ||
| 2434 | while ((fd = android_open (file, oflags, mode)) < 0 && errno == EINTR) | ||
| 2435 | maybe_quit (); | ||
| 2436 | |||
| 2437 | return fd; | ||
| 2438 | #endif | ||
| 2374 | } | 2439 | } |
| 2375 | 2440 | ||
| 2376 | /* Same as above, but doesn't allow the user to quit. */ | 2441 | /* Same as above, but doesn't allow the user to quit. */ |
| @@ -2382,9 +2447,15 @@ emacs_open_noquit (char const *file, int oflags, int mode) | |||
| 2382 | if (! (oflags & O_TEXT)) | 2447 | if (! (oflags & O_TEXT)) |
| 2383 | oflags |= O_BINARY; | 2448 | oflags |= O_BINARY; |
| 2384 | oflags |= O_CLOEXEC; | 2449 | oflags |= O_CLOEXEC; |
| 2450 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) | ||
| 2385 | do | 2451 | do |
| 2386 | fd = open (file, oflags, mode); | 2452 | fd = open (file, oflags, mode); |
| 2387 | while (fd < 0 && errno == EINTR); | 2453 | while (fd < 0 && errno == EINTR); |
| 2454 | #else | ||
| 2455 | do | ||
| 2456 | fd = android_open (file, oflags, mode); | ||
| 2457 | while (fd < 0 && errno == EINTR); | ||
| 2458 | #endif | ||
| 2388 | return fd; | 2459 | return fd; |
| 2389 | } | 2460 | } |
| 2390 | 2461 | ||
| @@ -2434,6 +2505,8 @@ emacs_pipe (int fd[2]) | |||
| 2434 | For the background behind this mess, please see Austin Group defect 529 | 2505 | For the background behind this mess, please see Austin Group defect 529 |
| 2435 | <https://austingroupbugs.net/view.php?id=529>. */ | 2506 | <https://austingroupbugs.net/view.php?id=529>. */ |
| 2436 | 2507 | ||
| 2508 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) | ||
| 2509 | |||
| 2437 | #ifndef POSIX_CLOSE_RESTART | 2510 | #ifndef POSIX_CLOSE_RESTART |
| 2438 | # define POSIX_CLOSE_RESTART 1 | 2511 | # define POSIX_CLOSE_RESTART 1 |
| 2439 | static int | 2512 | static int |
| @@ -2460,6 +2533,8 @@ posix_close (int fd, int flag) | |||
| 2460 | } | 2533 | } |
| 2461 | #endif | 2534 | #endif |
| 2462 | 2535 | ||
| 2536 | #endif | ||
| 2537 | |||
| 2463 | /* Close FD, retrying if interrupted. If successful, return 0; | 2538 | /* Close FD, retrying if interrupted. If successful, return 0; |
| 2464 | otherwise, return -1 and set errno to a non-EINTR value. Consider | 2539 | otherwise, return -1 and set errno to a non-EINTR value. Consider |
| 2465 | an EINPROGRESS error to be successful, as that's merely a signal | 2540 | an EINPROGRESS error to be successful, as that's merely a signal |
| @@ -2472,9 +2547,17 @@ posix_close (int fd, int flag) | |||
| 2472 | int | 2547 | int |
| 2473 | emacs_close (int fd) | 2548 | emacs_close (int fd) |
| 2474 | { | 2549 | { |
| 2550 | int r; | ||
| 2551 | |||
| 2475 | while (1) | 2552 | while (1) |
| 2476 | { | 2553 | { |
| 2477 | int r = posix_close (fd, POSIX_CLOSE_RESTART); | 2554 | #if !(defined HAVE_ANDROID && !defined ANDROID_STUBIFY) |
| 2555 | r = posix_close (fd, POSIX_CLOSE_RESTART); | ||
| 2556 | #else | ||
| 2557 | r = android_close (fd) == 0 || errno == EINTR ? 0 : -1; | ||
| 2558 | #define POSIX_CLOSE_RESTART 1 | ||
| 2559 | #endif | ||
| 2560 | |||
| 2478 | if (r == 0) | 2561 | if (r == 0) |
| 2479 | return r; | 2562 | return r; |
| 2480 | if (!POSIX_CLOSE_RESTART || errno != EINTR) | 2563 | if (!POSIX_CLOSE_RESTART || errno != EINTR) |
| @@ -2729,6 +2812,15 @@ errwrite (void const *buf, ptrdiff_t nbuf) | |||
| 2729 | void | 2812 | void |
| 2730 | close_output_streams (void) | 2813 | close_output_streams (void) |
| 2731 | { | 2814 | { |
| 2815 | /* Android comes with some kind of ``file descriptor sanitizer'' | ||
| 2816 | that aborts when stdout or stderr is closed. */ | ||
| 2817 | |||
| 2818 | #if defined HAVE_ANDROID && !defined ANDROID_STUBIFY | ||
| 2819 | fflush (stderr); | ||
| 2820 | fflush (stdout); | ||
| 2821 | return; | ||
| 2822 | #endif | ||
| 2823 | |||
| 2732 | if (close_stream (stdout) != 0) | 2824 | if (close_stream (stdout) != 0) |
| 2733 | { | 2825 | { |
| 2734 | emacs_perror ("Write error to standard output"); | 2826 | emacs_perror ("Write error to standard output"); |