From owner-svn-ports-head@freebsd.org  Fri May 13 19:40:12 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D918B3A532;
 Fri, 13 May 2016 19:40:12 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1FD6D119D;
 Fri, 13 May 2016 19:40:12 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4DJeBEq073529;
 Fri, 13 May 2016 19:40:11 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4DJeBct073528;
 Fri, 13 May 2016 19:40:11 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605131940.u4DJeBct073528@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 13 May 2016 19:40:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415143 - head/x11-wm/selectwm/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 19:40:12 -0000

Author: bapt
Date: Fri May 13 19:40:11 2016
New Revision: 415143
URL: https://svnweb.freebsd.org/changeset/ports/415143

Log:
  Prevent collision with getline(3)

Added:
  head/x11-wm/selectwm/files/
  head/x11-wm/selectwm/files/patch-src_options.c   (contents, props changed)

Added: head/x11-wm/selectwm/files/patch-src_options.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/selectwm/files/patch-src_options.c	Fri May 13 19:40:11 2016	(r415143)
@@ -0,0 +1,20 @@
+--- src/options.c.orig	2002-05-22 17:39:27 UTC
++++ src/options.c
+@@ -32,7 +32,7 @@
+ #include "miscui.h"
+ #include "modify.h"
+ 
+-static GString *getline (FILE *fichier) {
++static GString *get_line (FILE *fichier) {
+ 	GString *temp;
+ 	gchar buf[128];
+ 	
+@@ -64,7 +64,7 @@ static gint read_config_file (config *se
+ 	}
+ 	buf = g_string_new ("");
+ 	while (!feof (config)) {
+-		buf = getline (config);
++		buf = get_line (config);
+ 
+ 		if (buf->len > 0 && buf->str[0] != '#') {
+ 			if (g_strrstr (buf->str, ":")) {