svn commit: r328856 - head/libexec/getty

Edward Tomasz Napierala trasz at FreeBSD.org
Sun Feb 4 18:39:59 UTC 2018


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];


More information about the svn-src-head mailing list