diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-11-01 20:30:04 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-11-01 20:30:04 +0000 |
| commit | b6a000b1cbbd0dc37909feec43489e5e4356b4cf (patch) | |
| tree | 472d5cd05d997ef35d1314f3e2c545ed06daeeab /src/appl | |
| parent | 387ccae59eace1a934a2d64f1f6fc90758a21a10 (diff) | |
| download | krb5-b6a000b1cbbd0dc37909feec43489e5e4356b4cf.tar.gz krb5-b6a000b1cbbd0dc37909feec43489e5e4356b4cf.tar.xz krb5-b6a000b1cbbd0dc37909feec43489e5e4356b4cf.zip | |
Oops - checked in a newer version by accident
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12850 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/gssftp/ftpd/popen.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/appl/gssftp/ftpd/popen.c b/src/appl/gssftp/ftpd/popen.c index 068706b61..d26746107 100644 --- a/src/appl/gssftp/ftpd/popen.c +++ b/src/appl/gssftp/ftpd/popen.c @@ -50,10 +50,8 @@ static char sccsid[] = "@(#)popen.c 5.9 (Berkeley) 2/25/91"; #include <vfork.h> #endif -#include "extern.h" - /* - * Special version of popen which avoids call to shell. This insures no-one + * Special version of popen which avoids call to shell. This insures noone * may create a pipe to a hidden program as a side effect of a list or dir * command. */ @@ -67,13 +65,13 @@ FILE * ftpd_popen(program, type) char *program, *type; { - char *cp; - FILE *iop; + register char *cp; + FILE *volatile iop; int argc, gargc, pdes[2], pid; char **pop, *argv[MAX_ARGV], *gargv[MAX_GARGV], *vv[2]; - extern char **ftpglob(); + extern char **ftpglob(), **copyblk(); - if ((*type != 'r' && *type != 'w') || type[1]) + if (*type != 'r' && *type != 'w' || type[1]) return(NULL); if (!pids) { @@ -145,14 +143,11 @@ ftpd_popen(program, type) pfree: for (argc = 1; argv[argc] != NULL; argc++) { blkfree((char **)argv[argc]); -#if 0 free((char *)argv[argc]); -#endif } return(iop); } -int ftpd_pclose(iop) FILE *iop; { |