circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-02 22:08:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2020-04-16 10:01:33 +01:00
commit dd66ede38b
3 changed files with 15 additions and 2 deletions

4
server-fn.c
View File

@ -335,8 +335,8 @@ server_destroy_pane(struct window_pane *wp, int notify)
tim); tim);
} else if (WIFSIGNALED(wp->status)) { } else if (WIFSIGNALED(wp->status)) {
screen_write_nputs(&ctx, -1, &gc, screen_write_nputs(&ctx, -1, &gc,
"Pane is dead (signal %d, %s)", "Pane is dead (signal %s, %s)",
WTERMSIG(wp->status), sig2name(WTERMSIG(wp->status)),
tim); tim);
} }

12
tmux.c
View File

@ -26,6 +26,7 @@
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>
#include <pwd.h> #include <pwd.h>
#include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -164,6 +165,17 @@ setblocking(int fd, int state)
} }
} }
const char *
sig2name(int signo)
{
static char s[11];
if (signo > 0 && signo < NSIG)
return (sys_signame[signo]);
xsnprintf(s, sizeof s, "%d", signo);
return (s);
}
const char * const char *
find_cwd(void) find_cwd(void)
{ {

1
tmux.h
View File

@ -1727,6 +1727,7 @@ extern int ptm_fd;
extern const char *shell_command; extern const char *shell_command;
int checkshell(const char *); int checkshell(const char *);
void setblocking(int, int); void setblocking(int, int);
const char *sig2name(int);
const char *find_cwd(void); const char *find_cwd(void);
const char *find_home(void); const char *find_home(void);
const char *getversion(void); const char *getversion(void);