diff options
| author | markm <markm@FreeBSD.org> | 2002-03-23 15:43:11 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-23 15:43:11 +0000 |
| commit | 0dcefe7b55beecbfaeba7c0b20e4b1277b781733 (patch) | |
| tree | 45a6c7b3a0b609f6fb9e83681cc212050f9f22f2 /usr.bin/rsh | |
| parent | 22ddd5d3aba0e3afb5983bcad6ae21dadbe1370e (diff) | |
| download | FreeBSD-src-0dcefe7b55beecbfaeba7c0b20e4b1277b781733.zip FreeBSD-src-0dcefe7b55beecbfaeba7c0b20e4b1277b781733.tar.gz | |
Very simple fixes; WARNS and ANSIfy. Remove GCC-specific options from
Makefile.
Diffstat (limited to 'usr.bin/rsh')
| -rw-r--r-- | usr.bin/rsh/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/rsh/rsh.c | 30 |
2 files changed, 11 insertions, 20 deletions
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile index 404c9a6..e365a81 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -3,7 +3,6 @@ PROG= rsh SRCS= rsh.c -CFLAGS+=-Wall CFLAGS+=-I${.CURDIR}/../../libexec/rlogind .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index a011642..8a7a62e 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -38,13 +38,12 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 -static char sccsid[] = "From: @(#)rsh.c 8.3 (Berkeley) 4/6/94"; -#endif -static const char rcsid[] = - "$FreeBSD$"; +static const char sccsid[] = "From: @(#)rsh.c 8.3 (Berkeley) 4/6/94"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/signal.h> #include <sys/socket.h> @@ -86,6 +85,7 @@ extern char *krb_realmofhost(); int rfd2; int family = PF_UNSPEC; +char rlogin[] = "rlogin"; char *copyargs(char **); void sendsig(int); @@ -93,9 +93,7 @@ void talk(int, long, pid_t, int, int); void usage(void); int -main(argc, argv) - int argc; - char **argv; +main(int argc, char *argv[]) { struct passwd *pw; struct servent *sp; @@ -196,7 +194,7 @@ main(argc, argv) /* if no further arguments, must have been called as rlogin. */ if (!argv[optind]) { if (asrsh) - *argv = "rlogin"; + *argv = rlogin; execv(_PATH_RLOGIN, argv); err(1, "can't exec %s", _PATH_RLOGIN); } @@ -336,11 +334,7 @@ try_connect: } void -talk(nflag, omask, pid, rem, timeout) - int nflag; - long omask; - pid_t pid; - int rem; +talk(int nflag, long omask, pid_t pid, int rem, int timeout) { int cc, wc; fd_set readfrom, ready, rembits; @@ -449,8 +443,7 @@ done: } void -sendsig(sig) - int sig; +sendsig(int sig) { char signo; @@ -466,8 +459,7 @@ sendsig(sig) } char * -copyargs(argv) - char **argv; +copyargs(char **argv) { int cc; char **ap, *args, *p; @@ -487,7 +479,7 @@ copyargs(argv) } void -usage() +usage(void) { (void)fprintf(stderr, |
