===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/usr.bin/tmux/status.c	2009/10/10 10:02:48	1.37
--- src/usr.bin/tmux/status.c	2009/10/10 15:03:01	1.38
***************
*** 1,4 ****
! /* $OpenBSD: status.c,v 1.37 2009/10/10 10:02:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: status.c,v 1.38 2009/10/10 15:03:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 29,35 ****
  
  #include "tmux.h"
  
! char   *status_replace_popen(char **);
  size_t	status_width(struct winlink *);
  char   *status_print(struct session *, struct winlink *, struct grid_cell *);
  
--- 29,36 ----
  
  #include "tmux.h"
  
! char   *status_job(struct client *, char **);
! void	status_job_callback(struct job *);
  size_t	status_width(struct winlink *);
  char   *status_print(struct session *, struct winlink *, struct grid_cell *);
  
***************
*** 104,117 ****
  	utf8flag = options_get_number(&s->options, "status-utf8");
  
  	/* Work out the left and right strings. */
! 	left = status_replace(s, options_get_string(
  	    &s->options, "status-left"), c->status_timer.tv_sec);
  	llen = options_get_number(&s->options, "status-left-length");
  	llen2 = screen_write_cstrlen(utf8flag, "%s", left);
  	if (llen2 < llen)
  		llen = llen2;
  
! 	right = status_replace(s, options_get_string(
  	    &s->options, "status-right"), c->status_timer.tv_sec);
  	rlen = options_get_number(&s->options, "status-right-length");
  	rlen2 = screen_write_cstrlen(utf8flag, "%s", right);
--- 105,118 ----
  	utf8flag = options_get_number(&s->options, "status-utf8");
  
  	/* Work out the left and right strings. */
! 	left = status_replace(c, options_get_string(
  	    &s->options, "status-left"), c->status_timer.tv_sec);
  	llen = options_get_number(&s->options, "status-left-length");
  	llen2 = screen_write_cstrlen(utf8flag, "%s", left);
  	if (llen2 < llen)
  		llen = llen2;
  
! 	right = status_replace(c, options_get_string(
  	    &s->options, "status-right"), c->status_timer.tv_sec);
  	rlen = options_get_number(&s->options, "status-right-length");
  	rlen2 = screen_write_cstrlen(utf8flag, "%s", right);
***************
*** 317,331 ****
  }
  
  char *
! status_replace(struct session *s, const char *fmt, time_t t)
  {
  	struct winlink *wl = s->curw;
  	static char	out[BUFSIZ];
  	char		in[BUFSIZ], tmp[256], ch, *iptr, *optr, *ptr, *endptr;
! 	char           *savedptr;
  	size_t		len;
  	long		n;
! 
  	strftime(in, sizeof in, fmt, localtime(&t));
  	in[(sizeof in) - 1] = '\0';
  
--- 318,334 ----
  }
  
  char *
! status_replace(struct client *c, const char *fmt, time_t t)
  {
+ 	struct session *s = c->session;
  	struct winlink *wl = s->curw;
  	static char	out[BUFSIZ];
  	char		in[BUFSIZ], tmp[256], ch, *iptr, *optr, *ptr, *endptr;
! 	char           *savedptr;	/* freed at end of each loop */
  	size_t		len;
  	long		n;
! 	
! 	
  	strftime(in, sizeof in, fmt, localtime(&t));
  	in[(sizeof in) - 1] = '\0';
  
***************
*** 352,358 ****
  			switch (*iptr++) {
  			case '(':
  				if (ptr == NULL) {
! 					ptr = status_replace_popen(&iptr);
  					if (ptr == NULL)
  						break;
  					savedptr = ptr;
--- 355,361 ----
  			switch (*iptr++) {
  			case '(':
  				if (ptr == NULL) {
! 					ptr = status_job(c, &iptr);
  					if (ptr == NULL)
  						break;
  					savedptr = ptr;
***************
*** 374,381 ****
  			case 'P':
  				if (ptr == NULL) {
  					xsnprintf(tmp, sizeof tmp, "%u",
! 						  window_pane_index(wl->window,
! 						  wl->window->active));
  					ptr = tmp;
  				}
  				/* FALLTHROUGH */
--- 377,384 ----
  			case 'P':
  				if (ptr == NULL) {
  					xsnprintf(tmp, sizeof tmp, "%u",
! 					    window_pane_index(wl->window,
! 					    wl->window->active));
  					ptr = tmp;
  				}
  				/* FALLTHROUGH */
***************
*** 434,445 ****
  }
  
  char *
! status_replace_popen(char **iptr)
  {
! 	FILE	*f;
! 	char	*buf, *cmd, *ptr;
! 	int	lastesc;
! 	size_t	len;
  
  	if (**iptr == '\0')
  		return (NULL);
--- 437,448 ----
  }
  
  char *
! status_job(struct client *c, char **iptr)
  {
! 	struct job	*job;
! 	char   		*buf, *cmd;
! 	int		 lastesc;
! 	size_t		 len;
  
  	if (**iptr == '\0')
  		return (NULL);
***************
*** 464,495 ****
  		lastesc = 0;
  		cmd[len++] = **iptr;
  	}
! 	if (**iptr == '\0')		/* no terminating ) */
! 		goto out;
  	(*iptr)++;			/* skip final ) */
  	cmd[len] = '\0';
  
! 	if ((f = popen(cmd, "r")) == NULL)
! 		goto out;
! 
! 	if ((buf = fgetln(f, &len)) == NULL) {
! 		pclose(f);
! 		goto out;
  	}
! 	if (buf[len - 1] == '\n') {
! 		buf[len - 1] = '\0';
! 		buf = xstrdup(buf);
! 	} else {
! 		ptr = xmalloc(len + 1);
! 		memcpy(ptr, buf, len);
! 		ptr[len] = '\0';
! 		buf = ptr;
! 	}
! 	pclose(f);
  
! out:
! 	xfree(cmd);
! 	return (buf);
  }
  
  size_t
--- 467,510 ----
  		lastesc = 0;
  		cmd[len++] = **iptr;
  	}
! 	if (**iptr == '\0')		/* no terminating ) */ {
! 		xfree(cmd);
! 		return (NULL);
! 	}
  	(*iptr)++;			/* skip final ) */
  	cmd[len] = '\0';
  
! 	job = job_get(&c->status_jobs, cmd);
! 	if (job == NULL) {
! 		job = job_add(
! 		    &c->status_jobs, c, cmd, status_job_callback, xfree, NULL);
! 		job_run(job);
  	}
! 	if (job->data == NULL)
! 		return (xstrdup(""));
! 	return (xstrdup(job->data));
! }
  
! void
! status_job_callback(struct job *job)
! {
! 	char	*buf;
! 	size_t	 len;
! 
! 	len = BUFFER_USED(job->out);
! 	buf = xmalloc(len + 1);
! 	if (len != 0)
! 		buffer_read(job->out, buf, len);
! 	buf[len] = '\0';
! 	buf[strcspn(buf, "\n")] = '\0';
! 
! 	if (job->data != NULL)
! 		xfree(job->data);
! 	else
! 		server_redraw_client(job->client);
! 	job->data = xstrdup(buf);
! 
! 	xfree(buf);
  }
  
  size_t