circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Use pgrp of pty fd not pid of immediate child when recovering current working

Browse Source 
directory (like current process). From Marcel Partap.
This commit is contained in:
Nicholas Marriott
2012-09-24 14:05:38 +01:00
parent 5b85efeb93
commit 5d60bc7f7c
13 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd.c
View File

@@ -1297,7 +1297,7 @@ cmd_get_default_path(struct cmd_ctx *ctx, const char *cwd)
if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL) if (ctx->cmdclient != NULL && ctx->cmdclient->cwd != NULL)
root = ctx->cmdclient->cwd; root = ctx->cmdclient->cwd;
else if (ctx->curclient != NULL && s->curw != NULL) else if (ctx->curclient != NULL && s->curw != NULL)
root = osdep_get_cwd(s->curw->window->active->pid); root = osdep_get_cwd(s->curw->window->active->fd);
else else
return (s->cwd); return (s->cwd);
skip = 0; skip = 0;

2
format.c
View File

@@ -391,7 +391,7 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
format_add(ft, "pane_start_command", "%s", wp->cmd); format_add(ft, "pane_start_command", "%s", wp->cmd);
if (wp->cwd != NULL) if (wp->cwd != NULL)
format_add(ft, "pane_start_path", "%s", wp->cwd); format_add(ft, "pane_start_path", "%s", wp->cwd);
format_add(ft, "pane_current_path", "%s", osdep_get_cwd(wp->pid)); format_add(ft, "pane_current_path", "%s", osdep_get_cwd(wp->fd));
format_add(ft, "pane_pid", "%ld", (long) wp->pid); format_add(ft, "pane_pid", "%ld", (long) wp->pid);
format_add(ft, "pane_tty", "%s", wp->tty); format_add(ft, "pane_tty", "%s", wp->tty);
} }

2
osdep-aix.c
View File

@@ -29,7 +29,7 @@ osdep_get_name(unused int fd, unused char *tty)
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(unused int fd)
{ {
return (NULL); return (NULL);
} }

10
osdep-darwin.c
View File

@@ -26,7 +26,7 @@
#include <unistd.h> #include <unistd.h>
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
char *osdep_get_cwd(pid_t); char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
#define unused __attribute__ ((unused)) #define unused __attribute__ ((unused))
@@ -51,14 +51,18 @@ osdep_get_name(int fd, unused char *tty)
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
static char wd[PATH_MAX]; static char wd[PATH_MAX];
struct proc_vnodepathinfo pathinfo; struct proc_vnodepathinfo pathinfo;
pid_t pgrp;
int ret; int ret;
if ((pgrp = tcgetpgrp(fd)) == -1)
return (NULL);
ret = proc_pidinfo( ret = proc_pidinfo(
pid, PROC_PIDVNODEPATHINFO, 0, &pathinfo, sizeof pathinfo); pgrp, PROC_PIDVNODEPATHINFO, 0, &pathinfo, sizeof pathinfo);
if (ret == sizeof pathinfo) { if (ret == sizeof pathinfo) {
strlcpy(wd, pathinfo.pvi_cdir.vip_path, sizeof wd); strlcpy(wd, pathinfo.pvi_cdir.vip_path, sizeof wd);
return (wd); return (wd);

4
osdep-dragonfly.c
View File

@@ -31,7 +31,7 @@
struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *); struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
char *osdep_get_cwd(pid_t); char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
#ifndef nitems #ifndef nitems
@@ -121,7 +121,7 @@ error:
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
return (NULL); return (NULL);
} }

10
osdep-freebsd.c
View File

@@ -33,7 +33,7 @@
struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *); struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
char *osdep_get_cwd(pid_t); char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
#ifndef nitems #ifndef nitems
@@ -133,13 +133,17 @@ error:
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
static char wd[PATH_MAX]; static char wd[PATH_MAX];
struct kinfo_file *info = NULL; struct kinfo_file *info = NULL;
pid_t pgrp;
int nrecords, i; int nrecords, i;
if ((info = kinfo_getfile(pid, &nrecords)) == NULL) if ((pgrp = tcgetpgrp(fd)) == -1)
return (NULL);
if ((info = kinfo_getfile(pgrp, &nrecords)) == NULL)
return (NULL); return (NULL);
for (i = 0; i < nrecords; i++) { for (i = 0; i < nrecords; i++) {

2
osdep-hpux.c
View File

@@ -29,7 +29,7 @@ osdep_get_name(unused int fd, unused char *tty)
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(unused int fd)
{ {
return (NULL); return (NULL);
} }

8
osdep-linux.c
View File

@@ -61,13 +61,17 @@ osdep_get_name(int fd, unused char *tty)
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
static char target[MAXPATHLEN + 1]; static char target[MAXPATHLEN + 1];
char *path; char *path;
pid_t pgrp;
ssize_t n; ssize_t n;
xasprintf(&path, "/proc/%d/cwd", pid); if ((pgrp = tcgetpgrp(fd)) == -1)
return (NULL);
xasprintf(&path, "/proc/%lld/cwd", (long long) pgrp);
n = readlink(path, target, MAXPATHLEN); n = readlink(path, target, MAXPATHLEN);
free(path); free(path);
if (n > 0) { if (n > 0) {

4
osdep-netbsd.c
View File

@@ -34,7 +34,7 @@
struct kinfo_proc2 *cmp_procs(struct kinfo_proc2 *, struct kinfo_proc2 *); struct kinfo_proc2 *cmp_procs(struct kinfo_proc2 *, struct kinfo_proc2 *);
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
char *osdep_get_cwd(pid_t); char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
struct kinfo_proc2 * struct kinfo_proc2 *
@@ -125,7 +125,7 @@ error:
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
return (NULL); return (NULL);
} }

8
osdep-openbsd.c
View File

@@ -37,7 +37,7 @@
struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *); struct kinfo_proc *cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
char *osdep_get_cwd(pid_t); char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
struct kinfo_proc * struct kinfo_proc *
@@ -135,12 +135,14 @@ error:
} }
char* char*
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
int name[] = { CTL_KERN, KERN_PROC_CWD, (int)pid }; int name[] = { CTL_KERN, KERN_PROC_CWD, 0 };
static char path[MAXPATHLEN]; static char path[MAXPATHLEN];
size_t pathlen = sizeof path; size_t pathlen = sizeof path;
if ((name[2] = tcgetpgrp(fd)) == -1)
return (NULL);
if (sysctl(name, 3, path, &pathlen, NULL, 0) != 0) if (sysctl(name, 3, path, &pathlen, NULL, 0) != 0)
return (NULL); return (NULL);
return (path); return (path);

8
osdep-sunos.c
View File

@@ -65,13 +65,17 @@ osdep_get_name(int fd, char *tty)
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
static char target[MAXPATHLEN + 1]; static char target[MAXPATHLEN + 1];
char *path; char *path;
ssize_t n; ssize_t n;
pid_t pgrp;
xasprintf(&path, "/proc/%u/path/cwd", (u_int) pid); if ((pgrp = tcgetpgrp(fd)) == -1)
return (NULL);
xasprintf(&path, "/proc/%u/path/cwd", (u_int) pgrp);
n = readlink(path, target, MAXPATHLEN); n = readlink(path, target, MAXPATHLEN);
free(path); free(path);
if (n > 0) { if (n > 0) {

2
osdep-unknown.c
View File

@@ -29,7 +29,7 @@ osdep_get_name(unused int fd, unused char *tty)
} }
char * char *
osdep_get_cwd(pid_t pid) osdep_get_cwd(int fd)
{ {
return (NULL); return (NULL);
} }

2
tmux.h
View File

@@ -2273,7 +2273,7 @@ u_int utf8_split2(u_int, u_char *);
/* osdep-*.c */ /* osdep-*.c */
char *osdep_get_name(int, char *); char *osdep_get_name(int, char *);
char *osdep_get_cwd(pid_t); char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
/* log.c */ /* log.c */