Skip to content

Commit

Permalink
Merge branch 'cygwin-3_3-branch'
Browse files Browse the repository at this point in the history
To allow Git for Windows to enjoy the bug fixes e.g. for
git-for-windows/git#3936 without having to
wait for Cygwin v3.3.6, we merge the current tip of `cygwin-3_3-branch`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jul 7, 2022
2 parents 7bd0119 + 521dfff commit 0cd2c0f
Show file tree
Hide file tree
Showing 14 changed files with 378 additions and 77 deletions.
5 changes: 5 additions & 0 deletions winsup/cygwin/cygheap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ init_cygheap::init_installation_root ()
if (p)
p = wcschr (p + 1, L'\\'); /* Skip share name */
}
else /* Long path prefix followed by drive letter path */
{
len = 4;
p += 4;
}
}
installation_root_buf[1] = L'?';
RtlInitEmptyUnicodeString (&installation_key, installation_key_buf,
Expand Down
8 changes: 8 additions & 0 deletions winsup/cygwin/fhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -1983,6 +1983,7 @@ class fhandler_termios: public fhandler_base
virtual void cleanup_before_exit () {}
virtual bool need_console_handler () { return false; }
virtual bool need_send_ctrl_c_event () { return true; }
virtual DWORD get_helper_pid () { return 0; }
};

enum ansi_intensity
Expand Down Expand Up @@ -2020,6 +2021,7 @@ class dev_console
{
pid_t owner;
bool is_legacy;
bool orig_virtual_terminal_processing_mode;

WORD default_color, underline_color, dim_color;

Expand Down Expand Up @@ -2088,6 +2090,7 @@ class dev_console
char *cons_rapoi;
bool cursor_key_app_mode;
bool disable_master_thread;
bool master_thread_suspended;
int num_processed; /* Number of input events in the current input buffer
already processed by cons_master_thread(). */

Expand Down Expand Up @@ -2466,6 +2469,7 @@ class fhandler_pty_master: public fhandler_pty_common
HANDLE from_slave_nat;
HANDLE output_mutex;
tty *ttyp;
DWORD helper_pid;
};
private:
int pktmode; // non-zero if pty in a packet mode.
Expand All @@ -2477,6 +2481,9 @@ class fhandler_pty_master: public fhandler_pty_common
HANDLE to_master, from_master;
cygthread *master_fwd_thread; // Master forwarding thread
HANDLE thread_param_copied_event;
HANDLE helper_goodbye;
HANDLE helper_h_process;
DWORD helper_pid;

public:
HANDLE get_echo_handle () const { return echo_r; }
Expand Down Expand Up @@ -2531,6 +2538,7 @@ class fhandler_pty_master: public fhandler_pty_common
void get_master_fwd_thread_param (master_fwd_thread_param_t *p);
void set_mask_flusho (bool m) { get_ttyp ()->mask_flusho = m; }
bool need_send_ctrl_c_event ();
DWORD get_helper_pid () { return helper_pid; }
};

class fhandler_dev_null: public fhandler_base
Expand Down
Loading

0 comments on commit 0cd2c0f

Please sign in to comment.