From cce03e138b6363036d9b6c3c96925b3a372e421b Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 13 Feb 2009 00:43:04 +0000 Subject: Looking up argv[0] is expensive, so just use p_comm for the window name which is good enough. Also increase name update time to 500 ms. --- osdep-linux.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'osdep-linux.c') diff --git a/osdep-linux.c b/osdep-linux.c index 079b562d..ccc176d9 100644 --- a/osdep-linux.c +++ b/osdep-linux.c @@ -1,4 +1,4 @@ -/* $Id: osdep-linux.c,v 1.4 2009-02-09 18:08:01 nicm Exp $ */ +/* $Id: osdep-linux.c,v 1.5 2009-02-13 00:43:04 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -26,8 +26,8 @@ #include "tmux.h" -int -osdep_get_name(int fd, unused char *tty, unused pid_t *last_pid, char **name) +char * +osdep_get_name(int fd, unused char *tty) { FILE *f; char *path, *buf; @@ -35,15 +35,13 @@ osdep_get_name(int fd, unused char *tty, unused pid_t *last_pid, char **name) int ch; pid_t pgrp; - *name = NULL; - if ((pgrp = tcgetpgrp(fd)) == -1) - return (-1); + return (NULL); xasprintf(&path, "/proc/%lld/cmdline", (long long) pgrp); if ((f = fopen(path, "r")) == NULL) { xfree(path); - return (-1); + return (NULL); } xfree(path); @@ -57,10 +55,9 @@ osdep_get_name(int fd, unused char *tty, unused pid_t *last_pid, char **name) } if (buf != NULL) buf[len] = '\0'; - *name = buf; fclose(f); - return (0); + return (buf); } #endif -- cgit