diff options
| author | peter <peter@FreeBSD.org> | 1999-08-26 00:45:36 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-08-26 00:45:36 +0000 |
| commit | b658a57c222af53cd4c00082ea592a9d9a5921f7 (patch) | |
| tree | 13d28ea779f60b0b14a0c8c4473b102be6331f8b /libexec/ftpd/popen.c | |
| parent | b9c4386c6dd646e1168d559d191533658946f6bc (diff) | |
| download | FreeBSD-src-b658a57c222af53cd4c00082ea592a9d9a5921f7.zip FreeBSD-src-b658a57c222af53cd4c00082ea592a9d9a5921f7.tar.gz | |
unifdef -DINTERNAL_LS - it's too useful to be off by default. If anyone
really dislikes this, we could add a switch to disable it at runtime and
check in popen.c.
Diffstat (limited to 'libexec/ftpd/popen.c')
| -rw-r--r-- | libexec/ftpd/popen.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c index 665dc45..6b21215 100644 --- a/libexec/ftpd/popen.c +++ b/libexec/ftpd/popen.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$Id: popen.c,v 1.14 1998/05/15 16:51:06 ache Exp $"; + "$Id: popen.c,v 1.15 1998/05/18 00:06:28 ache Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -54,12 +54,10 @@ static const char rcsid[] = #include <unistd.h> #include "extern.h" -#ifdef INTERNAL_LS #include "pathnames.h" #include <syslog.h> #include <time.h> #include <varargs.h> -#endif #define MAXUSRARGS 100 #define MAXGLOBARGS 1000 @@ -119,12 +117,8 @@ ftpd_popen(program, type) gargv[gargc] = NULL; iop = NULL; -#ifdef INTERNAL_LS fflush(NULL); pid = (strcmp(gargv[0], _PATH_LS) == 0) ? fork() : vfork(); -#else - pid = vfork(); -#endif switch(pid) { case -1: /* error */ (void)close(pdes[0]); @@ -146,7 +140,6 @@ ftpd_popen(program, type) } (void)close(pdes[1]); } -#ifdef INTERNAL_LS if (strcmp(gargv[0], _PATH_LS) == 0) { extern int optreset; /* Reset getopt for ls_main() */ @@ -162,7 +155,6 @@ ftpd_popen(program, type) } exit(ls_main(gargc, gargv)); } -#endif execv(gargv[0], gargv); _exit(1); } |
