aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/lukemftpd/src/popen.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2006-08-31 16:55:08 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2006-08-31 16:55:08 +0000
commita5a1d5d318c4cc2916c623e2a232b6ce009acfc5 (patch)
tree69a47569ca430ea4facdfde3a374c615d6ca4de2 /contrib/lukemftpd/src/popen.c
parent3a802515c66410d4be197709554a1888484563a8 (diff)
downloadsrc-vendor/NetBSD/lukemftpd.tar.gz
src-vendor/NetBSD/lukemftpd.zip
Import of LukeM's ftpd taken from the NetBSD CVS repo on 31-Aug-2006.vendor/NetBSD/lukemftpd
+ Add PAM and LOGIN_CAP support. Mostly from FreeBSD. + Implement option "-D", for running ftpd in standalone mode (daemon). + NLST should return 450 instead of 550 upon error, per RFC 959. + Add recvbufsize configuration option + Remove unreachable code (res could never be NULL here), Coverity CID 712. + Set file to NULL after calling fclose(), Coverity CID 2669. + Make sure that "su" is initialized before dereferencing it, Coverity CID 1075. + Cleanup utmp and utmpx support.
Notes
Notes: svn path=/vendor/lukemftpd/dist/; revision=161764
Diffstat (limited to 'contrib/lukemftpd/src/popen.c')
-rw-r--r--contrib/lukemftpd/src/popen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/lukemftpd/src/popen.c b/contrib/lukemftpd/src/popen.c
index a987475e5581..e7aeb3c8ef79 100644
--- a/contrib/lukemftpd/src/popen.c
+++ b/contrib/lukemftpd/src/popen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.30 2004-08-09 12:56:48 lukem Exp $ */
+/* $NetBSD: popen.c,v 1.31 2006/02/01 14:20:14 christos Exp $ */
/*-
* Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: popen.c,v 1.30 2004-08-09 12:56:48 lukem Exp $");
+__RCSID("$NetBSD: popen.c,v 1.31 2006/02/01 14:20:14 christos Exp $");
#endif
#endif /* not lint */
@@ -138,7 +138,7 @@ ftpd_popen(char *argv[], const char *ptype, int stderrfd)
goto pfree;
/* glob each piece */
- if (sl_add(sl, xstrdup(argv[0])) == -1)
+ if (sl_add(sl, ftpd_strdup(argv[0])) == -1)
goto pfree;
for (argc = 1; argv[argc]; argc++) {
glob_t gl;
@@ -146,13 +146,13 @@ ftpd_popen(char *argv[], const char *ptype, int stderrfd)
memset(&gl, 0, sizeof(gl));
if (glob(argv[argc], flags, NULL, &gl)) {
- if (sl_add(sl, xstrdup(argv[argc])) == -1) {
+ if (sl_add(sl, ftpd_strdup(argv[argc])) == -1) {
globfree(&gl);
goto pfree;
}
} else {
for (pop = gl.gl_pathv; *pop; pop++) {
- if (sl_add(sl, xstrdup(*pop)) == -1) {
+ if (sl_add(sl, ftpd_strdup(*pop)) == -1) {
globfree(&gl);
goto pfree;
}