From owner-svn-src-head@freebsd.org Sun Feb 4 18:39:59 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52F5BEE808C; Sun, 4 Feb 2018 18:39:59 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 04B066C812; Sun, 4 Feb 2018 18:39:59 +0000 (UTC) (envelope-from trasz@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F39D91DCCE; Sun, 4 Feb 2018 18:39:58 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w14Idwvo077381; Sun, 4 Feb 2018 18:39:58 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w14IdwP0077380; Sun, 4 Feb 2018 18:39:58 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201802041839.w14IdwP0077380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Sun, 4 Feb 2018 18:39:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328856 - head/libexec/getty X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/libexec/getty X-SVN-Commit-Revision: 328856 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Feb 2018 18:39:59 -0000 Author: trasz Date: Sun Feb 4 18:39:58 2018 New Revision: 328856 URL: https://svnweb.freebsd.org/changeset/base/328856 Log: Rename getty's getline() to get_line(), to avoid clash with getline(3). Obtained from: DragonFlyBSD MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/libexec/getty/main.c Modified: head/libexec/getty/main.c ============================================================================== --- head/libexec/getty/main.c Sun Feb 4 18:36:24 2018 (r328855) +++ head/libexec/getty/main.c Sun Feb 4 18:39:58 2018 (r328856) @@ -146,7 +146,7 @@ static void putf(const char *); static void putpad(const char *); static void puts(const char *); static void timeoverrun(int); -static char *getline(int); +static char *get_line(int); static void setttymode(int); static int opentty(const char *, int); @@ -318,7 +318,7 @@ main(int argc, char *argv[]) if ((fd = open(IF, O_RDONLY)) != -1) { char * cp; - while ((cp = getline(fd)) != NULL) { + while ((cp = get_line(fd)) != NULL) { putf(cp); } close(fd); @@ -707,7 +707,7 @@ prompt(void) static char * -getline(int fd) +get_line(int fd) { int i = 0; static char linebuf[512];