Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Jul 2011 08:32:30 GMT
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/158796: [patch] sysutils/tmux -- support #h status special char
Message-ID:  <201107110832.p6B8WUBo044997@red.freebsd.org>
Resent-Message-ID: <201107110840.p6B8eAWf037274@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         158796
>Category:       ports
>Synopsis:       [patch] sysutils/tmux -- support #h status special char
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 11 08:40:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        
>Organization:
The FreeBSD Project
>Environment:
>Description:
The patch attached, taken from OpenBSD CSV [1], adds support for the #h status bar special char, meaning "hostname of local host without the domain name".

[1] http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/tmux/status.c?rev=1.74
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: files/patch-hostname.diff
===================================================================
RCS file: files/patch-hostname.diff
diff -N files/patch-hostname.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-hostname.diff	11 Jul 2011 08:25:35 -0000
@@ -0,0 +1,32 @@
+--- status.c.orig	2011/04/18 20:49:05	1.73
++++ status.c	2011/04/24 22:32:07	1.74
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: status.c,v 1.73 2011/04/18 19:49:05 nicm Exp $ */
++/* $OpenBSD: status.c,v 1.74 2011/04/24 21:32:07 nicm Exp $ */
+ 
+ /*
+  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
+@@ -408,6 +408,13 @@ status_replace1(struct client *c, struct session *s, s
+ 	case 'H':
+ 		if (gethostname(tmp, sizeof tmp) != 0)
+ 			fatal("gethostname failed");
++		ptr = tmp;
++		goto do_replace;
++	case 'h':
++		if (gethostname(tmp, sizeof tmp) != 0)
++			fatal("gethostname failed");
++		if ((ptr = strchr(tmp, '.')) != NULL)
++			*ptr = '\0';
+ 		ptr = tmp;
+ 		goto do_replace;
+ 	case 'I':
+--- tmux.1.orig	2011/04/19 22:31:33	1.223
++++ tmux.1	2011/04/24 22:32:07	1.224
+@@ -2005,6 +2005,7 @@ may contain any of the following special character seq
+ .It Li "#(shell-command)" Ta "First line of the command's output"
+ .It Li "#[attributes]" Ta "Colour or attribute change"
+ .It Li "#H" Ta "Hostname of local host"
++.It Li "#h" Ta "Hostname of local host without the domain name"
+ .It Li "#F" Ta "Current window flag"
+ .It Li "#I" Ta "Current window index"
+ .It Li "#P" Ta "Current pane index"


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107110832.p6B8WUBo044997>