summaryrefslogtreecommitdiffstats
path: root/usr.bin/rlogin/rlogin.c
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2012-10-19 14:49:42 +0000
committered <ed@FreeBSD.org>2012-10-19 14:49:42 +0000
commitaf31e8843c2cc0ba388a33f341de8da1b50de433 (patch)
treeddffe542a2e921ec48c73d322a2046f559a9d74f /usr.bin/rlogin/rlogin.c
parentb1462253851ab8c1f6dde48bb7796b15d3f38253 (diff)
downloadFreeBSD-src-af31e8843c2cc0ba388a33f341de8da1b50de433.zip
FreeBSD-src-af31e8843c2cc0ba388a33f341de8da1b50de433.tar.gz
More -Wmissing-variable-declarations fixes.
In addition to adding `static' where possible: - bin/date: Move `retval' into extern.h to make it visible to date.c. - bin/ed: Move globally used variables into ed.h. - sbin/camcontrol: Move `verbose' into camcontrol.h and fix shadow warnings. - usr.bin/calendar: Remove unneeded variables. - usr.bin/chat: Make `line' local instead of global. - usr.bin/elfdump: Comment out unneeded function. - usr.bin/rlogin: Use _Noreturn instead of __dead2. - usr.bin/tset: Pull `Ospeed' into extern.h. - usr.sbin/mfiutil: Put global variables in mfiutil.h. - usr.sbin/pkg: Remove unused `os_corres'. - usr.sbin/quotaon, usr.sbin/repquota: Remove unused `qfname'.
Diffstat (limited to 'usr.bin/rlogin/rlogin.c')
-rw-r--r--usr.bin/rlogin/rlogin.c98
1 files changed, 49 insertions, 49 deletions
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index b134679..646630b 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -92,35 +92,35 @@ __FBSDID("$FreeBSD$");
#define SIGUSR1 30
#endif
-int eight, rem;
-struct termios deftty;
+static int eight, rem;
+static struct termios deftty;
-int family = PF_UNSPEC;
+static int family = PF_UNSPEC;
-int noescape;
-u_char escapechar = '~';
+static int noescape;
+static u_char escapechar = '~';
#define get_window_size(fd, wp) ioctl(fd, TIOCGWINSZ, wp)
-struct winsize winsize;
-
-void catch_child(int);
-void copytochild(int);
-void doit(long) __dead2;
-void done(int) __dead2;
-void echo(char);
-u_int getescape(const char *);
-void lostpeer(int);
-void mode(int);
-void msg(const char *);
-void oob(int);
-int reader(int);
-void sendwindow(void);
-void setsignal(int);
-void sigwinch(int);
-void stop(char);
-void usage(void) __dead2;
-void writer(void);
-void writeroob(int);
+static struct winsize winsize;
+
+static void catch_child(int);
+static void copytochild(int);
+static _Noreturn void doit(long);
+static _Noreturn void done(int);
+static void echo(char);
+static u_int getescape(const char *);
+static void lostpeer(int);
+static void mode(int);
+static void msg(const char *);
+static void oob(int);
+static int reader(int);
+static void sendwindow(void);
+static void setsignal(int);
+static void sigwinch(int);
+static void stop(char);
+static _Noreturn void usage(void);
+static void writer(void);
+static void writeroob(int);
int
main(int argc, char *argv[])
@@ -269,9 +269,9 @@ main(int argc, char *argv[])
/*NOTREACHED*/
}
-int child;
+static int child;
-void
+static void
doit(long omask)
{
@@ -309,7 +309,7 @@ doit(long omask)
}
/* trap a signal, unless it is being ignored. */
-void
+static void
setsignal(int sig)
{
int omask = sigblock(sigmask(sig));
@@ -319,7 +319,7 @@ setsignal(int sig)
(void)sigsetmask(omask);
}
-void
+static void
done(int status)
{
int w, wstatus;
@@ -334,14 +334,14 @@ done(int status)
exit(status);
}
-int dosigwinch;
+static int dosigwinch;
/*
* This is called when the reader process gets the out-of-band (urgent)
* request to turn on the window-changing protocol.
*/
/* ARGSUSED */
-void
+static void
writeroob(int signo __unused)
{
if (dosigwinch == 0) {
@@ -352,7 +352,7 @@ writeroob(int signo __unused)
}
/* ARGSUSED */
-void
+static void
catch_child(int signo __unused)
{
pid_t pid;
@@ -375,7 +375,7 @@ catch_child(int signo __unused)
* ~^Z suspend rlogin process.
* ~<delayed-suspend char> suspend rlogin process, but leave reader alone.
*/
-void
+static void
writer(void)
{
int bol, local, n;
@@ -432,7 +432,7 @@ writer(void)
}
}
-void
+static void
echo(char c)
{
char *p;
@@ -454,7 +454,7 @@ echo(char c)
(void)write(STDOUT_FILENO, buf, p - buf);
}
-void
+static void
stop(char cmdc)
{
mode(0);
@@ -466,7 +466,7 @@ stop(char cmdc)
}
/* ARGSUSED */
-void
+static void
sigwinch(int signo __unused)
{
struct winsize ws;
@@ -481,7 +481,7 @@ sigwinch(int signo __unused)
/*
* Send the window size to the server via the magic escape
*/
-void
+static void
sendwindow(void)
{
struct winsize ws;
@@ -506,13 +506,13 @@ sendwindow(void)
#define READING 1
#define WRITING 2
-jmp_buf rcvtop;
-int rcvcnt, rcvstate;
-pid_t ppid;
-char rcvbuf[8 * 1024];
+static jmp_buf rcvtop;
+static int rcvcnt, rcvstate;
+static pid_t ppid;
+static char rcvbuf[8 * 1024];
/* ARGSUSED */
-void
+static void
oob(int signo __unused)
{
struct termios tty;
@@ -593,7 +593,7 @@ oob(int signo __unused)
}
/* reader: read from remote: line -> 1 */
-int
+static int
reader(int omask)
{
int n, remaining;
@@ -636,7 +636,7 @@ reader(int omask)
}
}
-void
+static void
mode(int f)
{
struct termios tty;
@@ -667,7 +667,7 @@ mode(int f)
}
/* ARGSUSED */
-void
+static void
lostpeer(int signo __unused)
{
(void)signal(SIGPIPE, SIG_IGN);
@@ -677,19 +677,19 @@ lostpeer(int signo __unused)
/* copy SIGURGs to the child process via SIGUSR1. */
/* ARGSUSED */
-void
+static void
copytochild(int signo __unused)
{
(void)kill(child, SIGUSR1);
}
-void
+static void
msg(const char *str)
{
(void)fprintf(stderr, "rlogin: %s\r\n", str);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
@@ -698,7 +698,7 @@ usage(void)
exit(1);
}
-u_int
+static u_int
getescape(const char *p)
{
long val;
OpenPOWER on IntegriCloud