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
This commit is contained in:
parent
d545c29ed5
commit
6de165e2dd
@ -146,7 +146,7 @@ static void putf(const char *);
|
|||||||
static void putpad(const char *);
|
static void putpad(const char *);
|
||||||
static void puts(const char *);
|
static void puts(const char *);
|
||||||
static void timeoverrun(int);
|
static void timeoverrun(int);
|
||||||
static char *getline(int);
|
static char *get_line(int);
|
||||||
static void setttymode(int);
|
static void setttymode(int);
|
||||||
static int opentty(const char *, int);
|
static int opentty(const char *, int);
|
||||||
|
|
||||||
@ -318,7 +318,7 @@ main(int argc, char *argv[])
|
|||||||
if ((fd = open(IF, O_RDONLY)) != -1) {
|
if ((fd = open(IF, O_RDONLY)) != -1) {
|
||||||
char * cp;
|
char * cp;
|
||||||
|
|
||||||
while ((cp = getline(fd)) != NULL) {
|
while ((cp = get_line(fd)) != NULL) {
|
||||||
putf(cp);
|
putf(cp);
|
||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
@ -707,7 +707,7 @@ prompt(void)
|
|||||||
|
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
getline(int fd)
|
get_line(int fd)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
static char linebuf[512];
|
static char linebuf[512];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user