aboutsummaryrefslogtreecommitdiff
path: root/libexec/ftpd/ftpd.c
diff options
context:
space:
mode:
authorJohn Birrell <jb@FreeBSD.org>1998-06-03 11:33:44 +0000
committerJohn Birrell <jb@FreeBSD.org>1998-06-03 11:33:44 +0000
commit158a00b20e005afd929e64bd0e39fab067d84b8b (patch)
tree30251ea497f8099268f0ad01cf7656b095c552ed /libexec/ftpd/ftpd.c
parentb76bb1d472e4dd07af106bb573d2543a0654c6d3 (diff)
downloadsrc-158a00b20e005afd929e64bd0e39fab067d84b8b.tar.gz
src-158a00b20e005afd929e64bd0e39fab067d84b8b.zip
signal() returns SIG_ERR on error, not int.
time() requires a time_t pointer, not a long.
Notes
Notes: svn path=/head/; revision=36612
Diffstat (limited to 'libexec/ftpd/ftpd.c')
-rw-r--r--libexec/ftpd/ftpd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 0e688e17b59e..d9b2e281d7a9 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94";
#endif
static const char rcsid[] =
- "$Id: ftpd.c,v 1.49 1998/05/16 21:23:33 ache Exp $";
+ "$Id: ftpd.c,v 1.50 1998/05/25 03:45:35 steve Exp $";
#endif /* not lint */
/*
@@ -460,7 +460,7 @@ main(argc, argv, envp)
(void) signal(SIGCHLD, SIG_IGN);
(void) signal(SIGPIPE, lostconn);
- if ((int)signal(SIGURG, myoob) < 0)
+ if (signal(SIGURG, myoob) == SIG_ERR)
syslog(LOG_ERR, "signal: %m");
#ifdef SKEY
@@ -1140,7 +1140,7 @@ retrieve(cmd, name)
FILE *fin, *dout;
struct stat st;
int (*closefunc) __P((FILE *));
- long start;
+ time_t start;
if (cmd == 0) {
fin = fopen(name, "r"), closefunc = fclose;
@@ -2297,7 +2297,7 @@ logxfer(name, size, start)
{
char buf[1024];
char path[MAXPATHLEN + 1];
- long now;
+ time_t now;
if (statfd >= 0 && getwd(path) != NULL) {
time(&now);