From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 11 08:40:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74E8E106567A for ; Mon, 11 Jul 2011 08:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 155598FC14 for ; Mon, 11 Jul 2011 08:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6B8eApS037275 for ; Mon, 11 Jul 2011 08:40:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6B8eAWf037274; Mon, 11 Jul 2011 08:40:10 GMT (envelope-from gnats) Resent-Date: Mon, 11 Jul 2011 08:40:10 GMT Resent-Message-Id: <201107110840.p6B8eAWf037274@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pietro Cerutti Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAE99106567B for ; Mon, 11 Jul 2011 08:32:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id B22DE8FC14 for ; Mon, 11 Jul 2011 08:32:30 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p6B8WUOV044998 for ; Mon, 11 Jul 2011 08:32:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p6B8WUBo044997; Mon, 11 Jul 2011 08:32:30 GMT (envelope-from nobody) Message-Id: <201107110832.p6B8WUBo044997@red.freebsd.org> Date: Mon, 11 Jul 2011 08:32:30 GMT From: Pietro Cerutti To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/158796: [patch] sysutils/tmux -- support #h status special char X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2011 08:40:11 -0000 >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 +@@ -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: