summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2000-05-20 02:20:18 +0000
committerlukem <lukem@NetBSD.org>2000-05-20 02:20:18 +0000
commitdcc88422addbd693cfd4e7c611644f8f534f8d42 (patch)
treead83551db051c146992e5661822a23327cc2d3b7 /libexec
parente55cd9cb854f98c6f463443108518d74902fda86 (diff)
convert to ANSI C as per style guide
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/conf.c36
-rw-r--r--libexec/ftpd/extern.h84
-rw-r--r--libexec/ftpd/ftpcmd.y43
-rw-r--r--libexec/ftpd/ftpd.c198
-rw-r--r--libexec/ftpd/logutmp.c6
-rw-r--r--libexec/ftpd/logwtmp.c7
-rw-r--r--libexec/ftpd/popen.c14
-rw-r--r--libexec/ftpd/version.h4
8 files changed, 147 insertions, 245 deletions
diff --git a/libexec/ftpd/conf.c b/libexec/ftpd/conf.c
index 1a3724a1de5..1c26027746f 100644
--- a/libexec/ftpd/conf.c
+++ b/libexec/ftpd/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.29 2000/01/13 00:04:31 lukem Exp $ */
+/* $NetBSD: conf.c,v 1.30 2000/05/20 02:20:18 lukem Exp $ */
/*-
* Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: conf.c,v 1.29 2000/01/13 00:04:31 lukem Exp $");
+__RCSID("$NetBSD: conf.c,v 1.30 2000/05/20 02:20:18 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -67,15 +67,15 @@ __RCSID("$NetBSD: conf.c,v 1.29 2000/01/13 00:04:31 lukem Exp $");
#include "extern.h"
#include "pathnames.h"
-static char *strend __P((const char *, char *));
-static int filetypematch __P((char *, int));
+static char *strend(const char *, char *);
+static int filetypematch(char *, int);
/*
* Initialise curclass to an `empty' state
*/
void
-init_curclass()
+init_curclass(void)
{
struct ftpconv *conv, *cnext;
@@ -115,8 +115,7 @@ init_curclass()
* define curclass to contain the appropriate settings.
*/
void
-parse_conf(findclass)
- char *findclass;
+parse_conf(const char *findclass)
{
FILE *f;
char *buf, *p;
@@ -459,8 +458,7 @@ parse_conf(findclass)
* responses with the prefix `code' + "-".
*/
void
-show_chdir_messages(code)
- int code;
+show_chdir_messages(int code)
{
static StringList *slist = NULL;
@@ -527,9 +525,7 @@ show_chdir_messages(code)
}
int
-format_file(file, code)
- const char *file;
- int code;
+format_file(const char *file, int code)
{
FILE *f;
char *buf, *p, *cwd;
@@ -637,9 +633,7 @@ format_file(file, code)
* not including) s2, otherwise returns NULL.
*/
static char *
-strend(s1, s2)
- const char *s1;
- char *s2;
+strend(const char *s1, char *s2)
{
static char buf[MAXPATHLEN];
@@ -663,9 +657,7 @@ strend(s1, s2)
}
static int
-filetypematch(types, mode)
- char *types;
- int mode;
+filetypematch(char *types, int mode)
{
for ( ; types[0] != '\0'; types++)
switch (*types) {
@@ -691,8 +683,7 @@ filetypematch(types, mode)
* multi-threaded ftpd, and that's not likely for a while...
*/
char **
-do_conversion(fname)
- const char *fname;
+do_conversion(const char *fname)
{
struct ftpconv *cp;
struct stat st;
@@ -765,8 +756,7 @@ do_conversion(fname)
* (`b', `k', `m', `g'). Returns the number for success, -1 otherwise.
*/
int
-strsuftoi(arg)
- const char *arg;
+strsuftoi(const char *arg)
{
char *cp;
long val;
@@ -810,7 +800,7 @@ strsuftoi(arg)
* if possible.
*/
void
-count_users()
+count_users(void)
{
char fn[MAXPATHLEN];
int fd, i, last;
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 347cbab087a..d295b9ae2c3 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.25 2000/03/05 06:12:19 lukem Exp $ */
+/* $NetBSD: extern.h,v 1.26 2000/05/20 02:20:18 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -100,45 +100,45 @@
* SUCH DAMAGE.
*/
-void blkfree __P((char **));
-char *conffilename __P((const char *));
-char **copyblk __P((char **));
-void count_users __P((void));
-void cwd __P((const char *));
-void delete __P((const char *));
-char **do_conversion __P((const char *));
-void dologout __P((int));
-void fatal __P((const char *));
-int format_file __P((const char *, int));
-int ftpd_pclose __P((FILE *));
-FILE *ftpd_popen __P((char *[], const char *, int));
-char *getline __P((char *, int, FILE *));
-void init_curclass __P((void));
-void logcmd __P((const char *, off_t, const char *, const char *,
- const struct timeval *, const char *));
-void logwtmp __P((const char *, const char *, const char *));
-void lreply __P((int, const char *, ...));
-void makedir __P((const char *));
-void parse_conf __P((char *));
-void pass __P((const char *));
-void passive __P((void));
-void long_passive __P((char *, int));
-void perror_reply __P((int, const char *));
-void pwd __P((void));
-void removedir __P((const char *));
-void renamecmd __P((const char *, const char *));
-char *renamefrom __P((char *));
-void reply __P((int, const char *, ...));
-void retrieve __P((char *[], const char *));
-void send_file_list __P((const char *));
-void show_chdir_messages __P((int));
-void statcmd __P((void));
-void statfilecmd __P((const char *));
-void store __P((const char *, const char *, int));
-int strsuftoi __P((const char *));
-void user __P((const char *));
-char *xstrdup __P((const char *));
-void yyerror __P((char *));
+void blkfree(char **);
+char *conffilename(const char *);
+char **copyblk(char **);
+void count_users(void);
+void cwd(const char *);
+void delete(const char *);
+char **do_conversion(const char *);
+void dologout(int);
+void fatal(const char *);
+int format_file(const char *, int);
+int ftpd_pclose(FILE *);
+FILE *ftpd_popen(char *[], const char *, int);
+char *getline(char *, int, FILE *);
+void init_curclass(void);
+void logcmd(const char *, off_t, const char *, const char *,
+ const struct timeval *, const char *);
+void logwtmp(const char *, const char *, const char *);
+void lreply(int, const char *, ...);
+void makedir(const char *);
+void parse_conf(const char *);
+void pass(const char *);
+void passive(void);
+void long_passive(char *, int);
+void perror_reply(int, const char *);
+void pwd(void);
+void removedir(const char *);
+void renamecmd(const char *, const char *);
+char *renamefrom(const char *);
+void reply(int, const char *, ...);
+void retrieve(char *[], const char *);
+void send_file_list(const char *);
+void show_chdir_messages(int);
+void statcmd(void);
+void statfilecmd(const char *);
+void store(const char *, const char *, int);
+int strsuftoi(const char *);
+void user(const char *);
+char *xstrdup(const char *);
+void yyerror(char *);
typedef long long qdfmt_t;
typedef unsigned long long qufmt_t;
@@ -198,7 +198,7 @@ union sockunion {
#define su_family su_si.si_family
#define su_port su_si.si_port
-extern int yyparse __P((void));
+extern int yyparse(void);
#ifndef GLOBAL
#define GLOBAL extern
@@ -250,6 +250,6 @@ GLOBAL off_t total_xfers_in, total_xfers_out, total_xfers;
(W) = strsep(&(P), " \t"); \
} while ((W) != NULL && *(W) == '\0')
#define PLURAL(s) ((s) == 1 ? "" : "s")
-#define REASSIGN(X,Y) do { if (X) free(X); (X)=(Y); } while (0)
+#define REASSIGN(X,Y) do { if (X) free(X); (X)=(Y); } while (/*CONSTCOND*/0)
#define INTERNAL_LS "/bin/ls"
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 3855e414a53..a6b071f4ec6 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpcmd.y,v 1.45 2000/03/05 06:12:19 lukem Exp $ */
+/* $NetBSD: ftpcmd.y,v 1.46 2000/05/20 02:20:18 lukem Exp $ */
/*-
* Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@
#if 0
static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: ftpcmd.y,v 1.45 2000/03/05 06:12:19 lukem Exp $");
+__RCSID("$NetBSD: ftpcmd.y,v 1.46 2000/05/20 02:20:18 lukem Exp $");
#endif
#endif /* not lint */
@@ -1468,19 +1468,17 @@ struct tab sitetab[] = {
{ NULL, 0, 0, 0, 0, 0 }
};
-static void help __P((struct tab *, char *));
-static struct tab *lookup __P((struct tab *, const char *));
-static void opts __P((const char *));
-static void sizecmd __P((char *));
-static void toolong __P((int));
-static int yylex __P((void));
+static void help(struct tab *, const char *);
+static struct tab *lookup(struct tab *, const char *);
+static void opts(const char *);
+static void sizecmd(char *);
+static void toolong(int);
+static int yylex(void);
extern int epsvall;
static struct tab *
-lookup(p, cmd)
- struct tab *p;
- const char *cmd;
+lookup(struct tab *p, const char *cmd)
{
for (; p->name != NULL; p++)
@@ -1495,10 +1493,7 @@ lookup(p, cmd)
* getline - a hacked up version of fgets to ignore TELNET escape codes.
*/
char *
-getline(s, n, iop)
- char *s;
- int n;
- FILE *iop;
+getline(char *s, int n, FILE *iop)
{
off_t b;
int c;
@@ -1585,8 +1580,7 @@ getline(s, n, iop)
}
static void
-toolong(signo)
- int signo;
+toolong(int signo)
{
reply(421,
@@ -1599,7 +1593,7 @@ toolong(signo)
}
static int
-yylex()
+yylex(void)
{
static int cpos, state;
char *cp, *cp2;
@@ -1835,8 +1829,7 @@ yylex()
/* ARGSUSED */
void
-yyerror(s)
- char *s;
+yyerror(char *s)
{
char *cp;
@@ -1849,9 +1842,7 @@ yyerror(s)
}
static void
-help(ctab, s)
- struct tab *ctab;
- char *s;
+help(struct tab *ctab, const char *s)
{
struct tab *c;
int width, NCMDS;
@@ -1934,8 +1925,7 @@ help(ctab, s)
}
static void
-sizecmd(filename)
- char *filename;
+sizecmd(char *filename)
{
switch (type) {
case TYPE_L:
@@ -1978,8 +1968,7 @@ sizecmd(filename)
}
static void
-opts(command)
- const char *command;
+opts(const char *command)
{
struct tab *c;
char *ep;
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 91e9a79e1c0..da3dddcee2f 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.87 2000/03/05 06:12:19 lukem Exp $ */
+/* $NetBSD: ftpd.c,v 1.88 2000/05/20 02:20:18 lukem Exp $ */
/*
* Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ftpd.c,v 1.87 2000/03/05 06:12:19 lukem Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.88 2000/05/20 02:20:18 lukem Exp $");
#endif
#endif /* not lint */
@@ -165,11 +165,7 @@ __RCSID("$NetBSD: ftpd.c,v 1.87 2000/03/05 06:12:19 lukem Exp $");
#include "pathnames.h"
#include "version.h"
-#if __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
int data;
jmp_buf urgcatch;
@@ -211,34 +207,31 @@ int swaitint = SWAITINT;
curclass.type == CLASS_REAL ? "REAL" : \
"<unknown>"
-static void ack __P((const char *));
-static int bind_pasv_addr __P((void));
-static int checkuser __P((const char *, const char *, int, int, char **));
-static int checkaccess __P((const char *));
-static FILE *dataconn __P((const char *, off_t, const char *));
-static void dolog __P((struct sockaddr *));
-static void end_login __P((void));
-static FILE *getdatasock __P((const char *));
-static char *gunique __P((const char *));
-static void lostconn __P((int));
-static void myoob __P((int));
-static int receive_data __P((FILE *, FILE *));
-static void replydirname __P((const char *, const char *));
-static int send_data __P((FILE *, FILE *, off_t, int));
-static struct passwd *
- sgetpwnam __P((const char *));
-
-int main __P((int, char *[]));
+static void ack(const char *);
+static int bind_pasv_addr(void);
+static int checkuser(const char *, const char *, int, int, char **);
+static int checkaccess(const char *);
+static FILE *dataconn(const char *, off_t, const char *);
+static void dolog(struct sockaddr *);
+static void end_login(void);
+static FILE *getdatasock(const char *);
+static char *gunique(const char *);
+static void lostconn(int);
+static void myoob(int);
+static int receive_data(FILE *, FILE *);
+static void replydirname(const char *, const char *);
+static int send_data(FILE *, FILE *, off_t, int);
+static struct passwd *sgetpwnam(const char *);
+
+int main(int, char *[]);
#if defined(KERBEROS) || defined(KERBEROS5)
-int klogin __P((struct passwd *, char *, char *, char *));
-void kdestroy __P((void));
+int klogin(struct passwd *, char *, char *, char *);
+void kdestroy(void);
#endif
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int addrlen, ch, on = 1, tos, keepalive;
#ifdef KERBEROS5
@@ -448,8 +441,7 @@ main(argc, argv)
}
static void
-lostconn(signo)
- int signo;
+lostconn(int signo)
{
if (debug)
@@ -463,8 +455,7 @@ lostconn(signo)
* (e.g., globbing).
*/
static struct passwd *
-sgetpwnam(name)
- const char *name;
+sgetpwnam(const char *name)
{
static struct passwd save;
struct passwd *p;
@@ -504,8 +495,7 @@ static char curname[10]; /* current USER name */
* _PATH_FTPUSERS to allow people such as root and uucp to be avoided.
*/
void
-user(name)
- const char *name;
+user(const char *name)
{
if (logged_in) {
switch (curclass.type) {
@@ -593,10 +583,8 @@ user(name)
* NOTE: needs struct passwd *pw setup before use.
*/
int
-checkuser(fname, name, def, nofile, retclass)
- const char *fname, *name;
- int def, nofile;
- char **retclass;
+checkuser(const char *fname, const char *name, int def, int nofile,
+ char **retclass)
{
FILE *fd;
int retval;
@@ -721,8 +709,7 @@ checkuser(fname, name, def, nofile, retclass)
* NOTE: needs struct passwd *pw setup (for checkuser())
*/
int
-checkaccess(name)
- const char *name;
+checkaccess(const char *name)
{
return (checkuser(_PATH_FTPUSERS, name, 1, 0, NULL));
@@ -733,7 +720,7 @@ checkaccess(name)
* used when USER command is given or login fails.
*/
static void
-end_login()
+end_login(void)
{
(void) seteuid((uid_t)0);
@@ -749,8 +736,7 @@ end_login()
}
void
-pass(passwd)
- const char *passwd;
+pass(const char *passwd)
{
int rval;
const char *cp, *shell, *home;
@@ -997,13 +983,11 @@ skip:
}
void
-retrieve(argv, name)
- char *argv[];
- const char *name;
+retrieve(char *argv[], const char *name)
{
FILE *fin = NULL, *dout;
struct stat st;
- int (*closefunc) __P((FILE *)) = NULL;
+ int (*closefunc)(FILE *) = NULL;
int log, sendrv, closerv, stderrfd, isconversion, isdata, isls;
struct timeval start, finish, td, *tdp;
const char *dispname;
@@ -1131,13 +1115,11 @@ done:
}
void
-store(name, mode, unique)
- const char *name, *mode;
- int unique;
+store(const char *name, const char *mode, int unique)
{
FILE *fout, *din;
struct stat st;
- int (*closefunc) __P((FILE *));
+ int (*closefunc)(FILE *);
struct timeval start, finish, td, *tdp;
char *desc;
@@ -1209,8 +1191,7 @@ done:
}
static FILE *
-getdatasock(mode)
- const char *mode;
+getdatasock(const char *mode)
{
int on = 1, s, t, tries;
@@ -1257,10 +1238,7 @@ bad:
}
static FILE *
-dataconn(name, size, mode)
- const char *name;
- off_t size;
- const char *mode;
+dataconn(const char *name, off_t size, const char *mode)
{
char sizebuf[32];
FILE *file;
@@ -1354,10 +1332,7 @@ dataconn(name, size, mode)
* NB: Form isn't handled.
*/
static int
-send_data(instr, outstr, blksize, isdata)
- FILE *instr, *outstr;
- off_t blksize;
- int isdata;
+send_data(FILE *instr, FILE *outstr, off_t blksize, int isdata)
{
int c, filefd, netfd, rval;
char *buf;
@@ -1507,8 +1482,7 @@ cleanup_send_data:
* N.B.: Form isn't handled.
*/
static int
-receive_data(instr, outstr)
- FILE *instr, *outstr;
+receive_data(FILE *instr, FILE *outstr)
{
int c, bare_lfs, netfd, filefd, rval;
char buf[BUFSIZ];
@@ -1652,8 +1626,7 @@ cleanup_recv_data:
}
void
-statfilecmd(filename)
- const char *filename;
+statfilecmd(const char *filename)
{
FILE *fin;
int c;
@@ -1688,7 +1661,7 @@ statfilecmd(filename)
}
void
-statcmd()
+statcmd(void)
{
union sockunion *su = NULL;
static char ntop_buf[INET6_ADDRSTRLEN];
@@ -1932,8 +1905,7 @@ epsvonly:;
}
void
-fatal(s)
- const char *s;
+fatal(const char *s)
{
reply(451, "Error in server: %s\n", s);
@@ -1943,22 +1915,12 @@ fatal(s)
}
void
-#ifdef __STDC__
reply(int n, const char *fmt, ...)
-#else
-reply(n, fmt, va_alist)
- int n;
- char *fmt;
- va_dcl
-#endif
{
off_t b;
va_list ap;
-#ifdef __STDC__
+
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
b = 0;
b += printf("%d ", n);
b += vprintf(fmt, ap);
@@ -1973,22 +1935,12 @@ reply(n, fmt, va_alist)
}
void
-#ifdef __STDC__
lreply(int n, const char *fmt, ...)
-#else
-lreply(n, fmt, va_alist)
- int n;
- char *fmt;
- va_dcl
-#endif
{
off_t b;
va_list ap;
-#ifdef __STDC__
+
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
b = 0;
switch (n) {
case 0:
@@ -2011,16 +1963,14 @@ lreply(n, fmt, va_alist)
}
static void
-ack(s)
- const char *s;
+ack(const char *s)
{
reply(250, "%s command successful.", s);
}
void
-delete(name)
- const char *name;
+delete(const char *name)
{
char *p = NULL;
@@ -2033,8 +1983,7 @@ delete(name)
}
void
-cwd(path)
- const char *path;
+cwd(const char *path)
{
if (chdir(path) < 0)
@@ -2046,8 +1995,7 @@ cwd(path)
}
static void
-replydirname(name, message)
- const char *name, *message;
+replydirname(const char *name, const char *message)
{
char npath[MAXPATHLEN];
int i;
@@ -2062,8 +2010,7 @@ replydirname(name, message)
}
void
-makedir(name)
- const char *name;
+makedir(const char *name)
{
char *p = NULL;
@@ -2076,8 +2023,7 @@ makedir(name)
}
void
-removedir(name)
- const char *name;
+removedir(const char *name)
{
char *p = NULL;
@@ -2090,7 +2036,7 @@ removedir(name)
}
void
-pwd()
+pwd(void)
{
char path[MAXPATHLEN];
@@ -2102,8 +2048,7 @@ pwd()
}
char *
-renamefrom(name)
- char *name;
+renamefrom(const char *name)
{
struct stat st;
@@ -2116,8 +2061,7 @@ renamefrom(name)
}
void
-renamecmd(from, to)
- const char *from, *to;
+renamecmd(const char *from, const char *to)
{
char *p = NULL;
@@ -2130,8 +2074,7 @@ renamecmd(from, to)
}
static void
-dolog(who)
- struct sockaddr *who;
+dolog(struct sockaddr *who)
{
getnameinfo(who, who->sa_len, remotehost, sizeof(remotehost), NULL,0,0);
#ifdef HASSETPROCTITLE
@@ -2148,8 +2091,7 @@ dolog(who)
* and exit with supplied status.
*/
void
-dologout(status)
- int status;
+dologout(int status)
{
/*
* Prevent reception of SIGURG from resulting in a resumption
@@ -2172,8 +2114,7 @@ dologout(status)
}
static void
-myoob(signo)
- int signo;
+myoob(int signo)
{
char *cp;
@@ -2204,7 +2145,7 @@ myoob(signo)
}
static int
-bind_pasv_addr()
+bind_pasv_addr(void)
{
static int passiveport;
int port, len;
@@ -2247,7 +2188,7 @@ bind_pasv_addr()
* with Rick Adams on 25 Jan 89.
*/
void
-passive()
+passive(void)
{
int len;
char *p, *a;
@@ -2394,8 +2335,7 @@ long_passive(char *cmd, int pf)
* the mktemp(3)/mkstemp(3) changes.
*/
static char *
-gunique(local)
- const char *local;
+gunique(const char *local)
{
static char new[MAXPATHLEN];
struct stat st;
@@ -2424,9 +2364,7 @@ gunique(local)
* Format and send reply containing system error number.
*/
void
-perror_reply(code, string)
- int code;
- const char *string;
+perror_reply(int code, const char *string)
{
int save_errno;
@@ -2441,8 +2379,7 @@ static char *onefile[] = {
};
void
-send_file_list(whichf)
- const char *whichf;
+send_file_list(const char *whichf)
{
struct stat st;
DIR *dirp = NULL;
@@ -2600,8 +2537,7 @@ out:
}
char *
-conffilename(s)
- const char *s;
+conffilename(const char *s)
{
static char filename[MAXPATHLEN];
@@ -2623,13 +2559,8 @@ conffilename(s)
*/
void
-logcmd(command, bytes, file1, file2, elapsed, error)
- const char *command;
- off_t bytes;
- const char *file1;
- const char *file2;
- const struct timeval *elapsed;
- const char *error;
+logcmd(const char *command, off_t bytes, const char *file1, const char *file2,
+ const struct timeval *elapsed, const char *error)
{
char buf[MAXPATHLEN * 2 + 100], realfile[MAXPATHLEN];
const char *p;
@@ -2674,8 +2605,7 @@ logcmd(command, bytes, file1, file2, elapsed, error)
}
char *
-xstrdup(s)
- const char *s;
+xstrdup(const char *s)
{
char *new = strdup(s);
diff --git a/libexec/ftpd/logutmp.c b/libexec/ftpd/logutmp.c
index 76f77096f3b..ec17287f24d 100644
--- a/libexec/ftpd/logutmp.c
+++ b/libexec/ftpd/logutmp.c
@@ -54,8 +54,7 @@ static int topslot = -1;
*/
void
-login(ut)
- const UTMP *ut;
+login(const UTMP *ut)
{
UTMP ubuf;
@@ -95,8 +94,7 @@ login(ut)
}
int
-logout(line)
- const char *line;
+logout(const char *line)
{
UTMP ut;
int rval;
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 5e99ce99f9a..1d9c95b1c47 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: logwtmp.c,v 1.14 2000/03/05 06:12:19 lukem Exp $ */
+/* $NetBSD: logwtmp.c,v 1.15 2000/05/20 02:20:19 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: logwtmp.c,v 1.14 2000/03/05 06:12:19 lukem Exp $");
+__RCSID("$NetBSD: logwtmp.c,v 1.15 2000/05/20 02:20:19 lukem Exp $");
#endif
#endif /* not lint */
@@ -72,8 +72,7 @@ static int fd = -1;
* after login, but before logout).
*/
void
-logwtmp(line, name, host)
- const char *line, *name, *host;
+logwtmp(const char *line, const char *name, const char *host)
{
struct utmp ut;
struct stat buf;
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 3eeec514c56..a208c064efe 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.20 2000/03/05 06:12:19 lukem Exp $ */
+/* $NetBSD: popen.c,v 1.21 2000/05/20 02:20:19 lukem Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: popen.c,v 1.20 2000/03/05 06:12:19 lukem Exp $");
+__RCSID("$NetBSD: popen.c,v 1.21 2000/05/20 02:20:19 lukem Exp $");
#endif
#endif /* not lint */
@@ -114,13 +114,10 @@ __RCSID("$NetBSD: popen.c,v 1.20 2000/03/05 06:12:19 lukem Exp $");
static int *pids;
static int fds;
-extern int ls_main __P((int, char *[]));
+extern int ls_main(int, char *[]);
FILE *
-ftpd_popen(argv, type, stderrfd)
- char *argv[];
- const char *type;
- int stderrfd;
+ftpd_popen(char *argv[], const char *type, int stderrfd)
{
FILE *iop;
int argc, pdes[2], pid, isls;
@@ -217,8 +214,7 @@ pfree: if (sl)
}
int
-ftpd_pclose(iop)
- FILE *iop;
+ftpd_pclose(FILE *iop)
{
int fdes, status;
pid_t pid;
diff --git a/libexec/ftpd/version.h b/libexec/ftpd/version.h
index ebe9427fb9e..f2a8fcc04bf 100644
--- a/libexec/ftpd/version.h
+++ b/libexec/ftpd/version.h
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.8 2000/03/05 06:12:19 lukem Exp $ */
+/* $NetBSD: version.h,v 1.9 2000/05/20 02:20:20 lukem Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,5 +36,5 @@
*/
#ifndef FTPD_VERSION
-#define FTPD_VERSION "NetBSD-ftpd 20000305"
+#define FTPD_VERSION "NetBSD-ftpd 20000520"
#endif