Add no_glob flag.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@794 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -78,7 +78,7 @@ static int *pids;
|
|||||||
static int fds;
|
static int fds;
|
||||||
|
|
||||||
FILE *
|
FILE *
|
||||||
ftpd_popen(char *program, char *type, int do_stderr)
|
ftpd_popen(char *program, char *type, int do_stderr, int no_glob)
|
||||||
{
|
{
|
||||||
char *cp;
|
char *cp;
|
||||||
FILE *iop;
|
FILE *iop;
|
||||||
@@ -115,7 +115,7 @@ ftpd_popen(char *program, char *type, int do_stderr)
|
|||||||
int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
|
int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
|
||||||
|
|
||||||
memset(&gl, 0, sizeof(gl));
|
memset(&gl, 0, sizeof(gl));
|
||||||
if (glob(argv[argc], flags, NULL, &gl))
|
if (no_glob || glob(argv[argc], flags, NULL, &gl))
|
||||||
gargv[gargc++] = strdup(argv[argc]);
|
gargv[gargc++] = strdup(argv[argc]);
|
||||||
else
|
else
|
||||||
for (pop = gl.gl_pathv; *pop; pop++)
|
for (pop = gl.gl_pathv; *pop; pop++)
|
||||||
|
Reference in New Issue
Block a user