circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-22 10:56:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-06-09 14:15:07 +01:00
parent 27111bd76d 34dd42dc7f
commit 490802099d
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-kill-session.c
View File

@@ -18,6 +18,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdlib.h>
#include "tmux.h" #include "tmux.h"
/* /*

2
cmd-kill-window.c
View File

@@ -18,6 +18,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdlib.h>
#include "tmux.h" #include "tmux.h"
/* /*

8
cmd-server-access.c
View File

@@ -63,7 +63,7 @@ cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
struct args *args = cmd_get_args(self); struct args *args = cmd_get_args(self);
struct client *c = cmdq_get_target_client(item); struct client *c = cmdq_get_target_client(item);
char *arg; char *arg;
const char *name, *type = NULL; const char *name = NULL, *type;
struct passwd *pw; struct passwd *pw;
struct group *gr; struct group *gr;
id_t id; id_t id;
@@ -80,20 +80,20 @@ cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
arg = format_single(item, args_string(args, 0), c, NULL, NULL, NULL); arg = format_single(item, args_string(args, 0), c, NULL, NULL, NULL);
if (args_has(args, 'g')) { if (args_has(args, 'g')) {
type = "group";
if ((gr = getgrnam(arg)) != NULL) { if ((gr = getgrnam(arg)) != NULL) {
type = "group";
id = gr->gr_gid; id = gr->gr_gid;
name = gr->gr_name; name = gr->gr_name;
flags |= SERVER_ACL_IS_GROUP; flags |= SERVER_ACL_IS_GROUP;
} }
} else { } else {
type = "user";
if ((pw = getpwnam(arg)) != NULL) { if ((pw = getpwnam(arg)) != NULL) {
type = "user";
id = pw->pw_uid; id = pw->pw_uid;
name = pw->pw_name; name = pw->pw_name;
} }
} }
if (type == NULL) { if (name == NULL) {
cmdq_error(item, "unknown %s: %s", type, arg); cmdq_error(item, "unknown %s: %s", type, arg);
free(arg); free(arg);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);

4
tmux.1
View File

@@ -3132,7 +3132,7 @@ Destroy the given pane.
If no panes remain in the containing window, it is also destroyed. If no panes remain in the containing window, it is also destroyed.
The The
.Fl a .Fl a
option kills all but the pane given with option kills all panes in the window except the pane given with
.Fl t . .Fl t .
When When
.Fl a .Fl a
@@ -3152,7 +3152,7 @@ Kill the current window or the window at
removing it from any sessions to which it is linked. removing it from any sessions to which it is linked.
The The
.Fl a .Fl a
option kills all but the window given with option kills all windows in the session except the window given with
.Fl t . .Fl t .
When When
.Fl a .Fl a