1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
--- work/ztelnet/telnet/commands.c.orig Wed Sep 20 02:03:45 1995
+++ work/ztelnet/telnet/commands.c Sun May 30 01:37:06 2004
@@ -40,7 +40,7 @@
#include <netdb.h>
#include <ctype.h>
#include <pwd.h>
-#include <varargs.h>
+#include <stdarg.h>
#include <errno.h>
#include <arpa/telnet.h>
@@ -79,8 +79,6 @@
extern char **genget();
extern int Ambiguous();
-static call();
-
typedef struct {
char *name; /* command name */
char *help; /* help string (NULL for no help) */
@@ -93,6 +91,12 @@
static int margc;
static char *margv[20];
+ void send_wont();
+ void send_dont();
+ void send_will();
+ void send_do();
+ typedef int (*intrtn_t)();
+ static call(intrtn_t routine, ...);
static void
makeargv()
{
@@ -230,10 +232,8 @@
int nbyte; /* Number of bytes to send this command */
int what; /* Character to be sent (<0 ==> special) */
};
+
-/* PMS
-extern int
-*/
static int
send_esc P((void)),
send_help P((void)),
@@ -370,7 +370,6 @@
send_docmd(name)
char *name;
{
- void send_do();
return(send_tncmd(send_do, "do", name));
}
@@ -378,21 +377,18 @@
send_dontcmd(name)
char *name;
{
- void send_dont();
return(send_tncmd(send_dont, "dont", name));
}
static int
send_willcmd(name)
char *name;
{
- void send_will();
return(send_tncmd(send_will, "will", name));
}
static int
send_wontcmd(name)
char *name;
{
- void send_wont();
return(send_tncmd(send_wont, "wont", name));
}
@@ -590,11 +586,8 @@
return 1;
}
-/* PMS
-extern int togglehelp P((void));
-*/
-static int togglehelp P((void));
+static int togglehelp P((void));
#if defined(AUTHENTICATE)
extern int auth_togdebug P((int));
#endif
@@ -828,12 +821,8 @@
*/
#ifdef USE_TERMIO
-#ifdef BYPMS
-struct termios new_tc = { 0 };
-#else
struct termio new_tc = { 0 };
#endif
-#endif
struct setlist {
char *name; /* name */
@@ -1559,9 +1548,6 @@
int arg;
};
-/* PMS
-extern void slc_help();
-*/
static void slc_help();
struct slclist SlcList[] = {
@@ -1640,15 +1626,13 @@
extern struct env_lst *
env_define P((unsigned char *, unsigned char *));
-extern void
+static void
env_undefine P((unsigned char *)),
env_export P((unsigned char *)),
env_unexport P((unsigned char *)),
env_send P((unsigned char *)),
- env_list P((void));
-
-/* PMS: extern is replaced by static */
-static void env_help P((void));
+ env_list P((void)),
+ env_help P((void));
struct envlist EnvList[] = {
{ "define", "Define an environment variable",
@@ -2232,7 +2216,7 @@
register struct hostent *host = 0;
struct sockaddr_in sin;
struct servent *sp = 0;
- unsigned long temp, inet_addr();
+ unsigned long temp;/*, inet_addr();*/
extern char *inet_ntoa();
#if defined(IP_OPTIONS) && defined(IPPROTO_IP)
char *srp = 0, *strrchr();
@@ -2489,11 +2473,7 @@
envhelp[] = "change environment variables ('environ ?' for more)",
modestring[] = "try to enter line or character mode ('mode ?' for more)";
-/* PMS
-extern int help();
-*/
-
-static int help();
+static int help();
static Command cmdtab[] = {
{ "close", closehelp, bye, 1 },
@@ -2548,18 +2528,13 @@
*/
/*VARARGS1*/
- static
-call(va_alist)
- va_dcl
+static call(intrtn_t routine, ...)
{
va_list ap;
- typedef int (*intrtn_t)();
- intrtn_t routine;
char *args[100];
int argno = 0;
- va_start(ap);
- routine = (va_arg(ap, intrtn_t));
+ va_start(ap, routine);
while ((args[argno++] = va_arg(ap, char *)) != 0) {
;
}
|
