diff options
| author | hubertf <hubertf@NetBSD.org> | 2007-01-17 21:44:50 +0000 |
|---|---|---|
| committer | hubertf <hubertf@NetBSD.org> | 2007-01-17 21:44:50 +0000 |
| commit | d405d8ca2b57c07aa24c218f1830df2dcddcf96e (patch) | |
| tree | 61de083e3085c3960f5903c7a97a8d91a526aab2 /libexec | |
| parent | 343432968633250a093b2f7695af7d2da3d94349 (diff) | |
Remove duplicated #includes and some trailing whitespace while here.
From Slava Semushin <slava.semushin@gmail.com>
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/getty/main.c | 19 | ||||
| -rw-r--r-- | libexec/telnetd/sys_term.c | 8 |
2 files changed, 12 insertions, 15 deletions
diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 18b8ddbdc58..adff5780962 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.51 2006/11/16 04:31:24 christos Exp $ */ +/* $NetBSD: main.c,v 1.52 2007/01/17 21:44:51 hubertf Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93"; #else -__RCSID("$NetBSD: main.c,v 1.51 2006/11/16 04:31:24 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.52 2007/01/17 21:44:51 hubertf Exp $"); #endif #endif /* not lint */ @@ -55,7 +55,6 @@ __RCSID("$NetBSD: main.c,v 1.51 2006/11/16 04:31:24 christos Exp $"); #include <fcntl.h> #include <time.h> #include <ctype.h> -#include <fcntl.h> #include <pwd.h> #include <setjmp.h> #include <signal.h> @@ -222,7 +221,7 @@ main(int argc, char *argv[], char *envp[]) * The following is a work around for vhangup interactions * which cause great problems getting window systems started. * If the tty line is "-", we do the old style getty presuming - * that the file descriptors are already set up for us. + * that the file descriptors are already set up for us. * J. Gettys - MIT Project Athena. */ if (argc <= 2 || strcmp(argv[2], "-") == 0) { @@ -240,7 +239,7 @@ main(int argc, char *argv[], char *envp[]) sizeof(lockfile)); (void)strlcat(lockfile, argv[2], sizeof(lockfile)); - /* + /* * wait for lockfiles to go away before we try * to open */ @@ -337,9 +336,9 @@ main(int argc, char *argv[], char *envp[]) putpad(CL); edithost(HE); - /* + /* * If this is the first time through this, and an - * issue file has been given, then send it. + * issue file has been given, then send it. */ if (first_time != 0 && IF != NULL) { char buf[_POSIX2_LINE_MAX]; @@ -352,7 +351,7 @@ main(int argc, char *argv[], char *envp[]) } } first_time = 0; - + if (IM && *IM) putf(IM); oflush(); @@ -387,7 +386,7 @@ main(int argc, char *argv[], char *envp[]) (void)execle(PP, "ppplogin", ttyn, (char *) 0, env); syslog(LOG_ERR, "%s: %m", PP); exit(1); - } + } if (rval || AL || NN) { int i; @@ -546,7 +545,7 @@ getname(void) continue; *np++ = c; putchr(cs); - + /* * An MS-Windows direct connect PPP "client" won't send its * first PPP packet until we respond to its "CLIENT" poll diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c index b2ffca46a20..79876d534a0 100644 --- a/libexec/telnetd/sys_term.c +++ b/libexec/telnetd/sys_term.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_term.c,v 1.43 2005/05/05 01:28:57 lukem Exp $ */ +/* $NetBSD: sys_term.c,v 1.44 2007/01/17 21:44:50 hubertf Exp $ */ /* * Copyright (c) 1989, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #else -__RCSID("$NetBSD: sys_term.c,v 1.43 2005/05/05 01:28:57 lukem Exp $"); +__RCSID("$NetBSD: sys_term.c,v 1.44 2007/01/17 21:44:50 hubertf Exp $"); #endif #endif /* not lint */ @@ -44,8 +44,6 @@ __RCSID("$NetBSD: sys_term.c,v 1.43 2005/05/05 01:28:57 lukem Exp $"); #include <util.h> #include <vis.h> -#include <sys/cdefs.h> - #include <utmp.h> struct utmp wtmp; @@ -190,7 +188,7 @@ static int ptyslavefd; /* for cleanopen() */ int getpty(int *ptynum) -{ +{ int ptyfd; ptyfd = openpty(ptynum, &ptyslavefd, line, NULL, NULL); |
