From owner-svn-ports-head@freebsd.org  Wed May 11 20:26:39 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 B8219B37454;
 Wed, 11 May 2016 20:26:39 +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 87C1613CD;
 Wed, 11 May 2016 20:26:39 +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 u4BKQcOj002747;
 Wed, 11 May 2016 20:26:38 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BKQcW9002746;
 Wed, 11 May 2016 20:26:38 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201605112026.u4BKQcW9002746@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: Wed, 11 May 2016 20:26:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415028 - head/shells/flash/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: Wed, 11 May 2016 20:26:39 -0000

Author: bapt
Date: Wed May 11 20:26:38 2016
New Revision: 415028
URL: https://svnweb.freebsd.org/changeset/ports/415028

Log:
  Prevent collision with getline(3)

Modified:
  head/shells/flash/files/patch-string.h

Modified: head/shells/flash/files/patch-string.h
==============================================================================
--- head/shells/flash/files/patch-string.h	Wed May 11 20:22:07 2016	(r415027)
+++ head/shells/flash/files/patch-string.h	Wed May 11 20:26:38 2016	(r415028)
@@ -1,6 +1,6 @@
---- string.h.orig	Thu Jan 18 01:21:24 2001
-+++ string.h	Fri Jan 26 05:36:32 2001
-@@ -2,7 +2,6 @@
+--- string.h.orig	2001-11-03 18:09:21 UTC
++++ string.h
+@@ -2,14 +2,13 @@
  #   define __STRING_H
  
  #include <ctype.h>
@@ -8,3 +8,11 @@
  
  #define CR '\n'
  #define TAB '\t'
+ 
+ char *readline(FILE *fp);
+ char *findline(char *start, int *foundend);
+-int getline(const char *, char *);
++int get_line(const char *, char *);
+ int substr(const char *, char *, char);
+ int strtokenize(char *line, char delim, char **tokens, int maxtokens);
+ char *stradp(char *filename);