oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Execute files from ~ftp if possible.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@798 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1996-09-29 03:54:27 +00:00
parent 16e06de382
commit 02a9fad78e
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
appl/ftp/ftpd/popen.c
View File

@@ -77,6 +77,28 @@ RCSID("$Id$");
static int *pids; static int *pids;
static int fds; static int fds;
extern int dochroot;
/* return path prepended with ~ftp if that file exists, otherwise
* return path unchanged
*/
const char *
ftp_rooted(const char *path)
{
static char home[MaxPathLen] = "";
static char newpath[MaxPathLen];
struct passwd *pwd;
if(!home[0])
if((pwd = getpwnam("ftp")))
strcpy(home, pwd->pw_dir);
sprintf(newpath, "%s/%s", home, path);
if(access(newpath, X_OK))
strcpy(newpath, path);
return newpath;
}
FILE * FILE *
ftpd_popen(char *program, char *type, int do_stderr, int no_glob) ftpd_popen(char *program, char *type, int do_stderr, int no_glob)
{ {
@@ -108,8 +130,8 @@ ftpd_popen(char *program, char *type, int do_stderr, int no_glob)
if (!(argv[argc++] = strtok(cp, " \t\n"))) if (!(argv[argc++] = strtok(cp, " \t\n")))
break; break;
gargv[0] = (char*)ftp_rooted(argv[0]);
/* glob each piece */ /* glob each piece */
gargv[0] = argv[0];
for (gargc = argc = 1; argv[argc]; argc++) { for (gargc = argc = 1; argv[argc]; argc++) {
glob_t gl; glob_t gl;
int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
@@ -159,9 +181,11 @@ ftpd_popen(char *program, char *type, int do_stderr, int no_glob)
close(pdes[0]); close(pdes[0]);
} }
pids[fileno(iop)] = pid; pids[fileno(iop)] = pid;
pfree:
for (argc = 1; gargv[argc] != NULL; argc++)
free(gargv[argc]);
pfree: for (argc = 1; gargv[argc] != NULL; argc++)
free(gargv[argc]);
return (iop); return (iop);
} }