From owner-svn-ports-head@freebsd.org Wed May 11 19:34:34 2016 Return-Path: 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 9AC5DB37E25; Wed, 11 May 2016 19:34:34 +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 4E3A311FC; Wed, 11 May 2016 19:34:34 +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 u4BJYX3X085647; Wed, 11 May 2016 19:34:33 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4BJYX3T085645; Wed, 11 May 2016 19:34:33 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201605111934.u4BJYX3T085645@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 11 May 2016 19:34:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415016 - head/mail/qconfirm/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 May 2016 19:34:34 -0000 Author: bapt Date: Wed May 11 19:34:33 2016 New Revision: 415016 URL: https://svnweb.freebsd.org/changeset/ports/415016 Log: Prevent collision with getline(3) Added: head/mail/qconfirm/files/ head/mail/qconfirm/files/patch-src_getline.c (contents, props changed) head/mail/qconfirm/files/patch-src_getline.h (contents, props changed) head/mail/qconfirm/files/patch-src_qconfirm-notice.c (contents, props changed) Added: head/mail/qconfirm/files/patch-src_getline.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/qconfirm/files/patch-src_getline.c Wed May 11 19:34:33 2016 (r415016) @@ -0,0 +1,11 @@ +--- src/getline.c.orig 2004-12-12 16:57:17 UTC ++++ src/getline.c +@@ -2,7 +2,7 @@ + #include "stralloc.h" + #include "byte.h" + +-int getline(buffer *b, stralloc *line) { ++int get_line(buffer *b, stralloc *line) { + int r, i; + char *x; + Added: head/mail/qconfirm/files/patch-src_getline.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/qconfirm/files/patch-src_getline.h Wed May 11 19:34:33 2016 (r415016) @@ -0,0 +1,5 @@ +--- src/getline.h.orig 2004-12-12 16:57:17 UTC ++++ src/getline.h +@@ -1 +1 @@ +-extern int getline(); ++extern int get_line(); Added: head/mail/qconfirm/files/patch-src_qconfirm-notice.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/qconfirm/files/patch-src_qconfirm-notice.c Wed May 11 19:34:33 2016 (r415016) @@ -0,0 +1,11 @@ +--- src/qconfirm-notice.c.orig 2004-12-12 16:57:17 UTC ++++ src/qconfirm-notice.c +@@ -386,7 +386,7 @@ int main(int argc, const char **argv) { + } + + /* check for confirmation request message */ +- while ((i =getline(buffer_0, &sa)) > 0) { ++ while ((i =get_line(buffer_0, &sa)) > 0) { + if ((i == 1) && (sa.s[0] == '\n')) break; /* end of headers */ + if (request && reply_to.s) break; + for (i =0; i < sa.len; ++i) {