From c1a675d4e95560001914f928ea9492a349042cea Mon Sep 17 00:00:00 2001 From: Jan-Simon Pendry Date: Wed, 6 Apr 1994 18:01:39 -0800 Subject: [PATCH] fix globbing - need NOCHECK flag SCCS-vsn: usr.bin/ftp/cmds.c 8.5 --- usr/src/usr.bin/ftp/cmds.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr/src/usr.bin/ftp/cmds.c b/usr/src/usr.bin/ftp/cmds.c index d6845b1859..021e4890fb 100644 --- a/usr/src/usr.bin/ftp/cmds.c +++ b/usr/src/usr.bin/ftp/cmds.c @@ -6,7 +6,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)cmds.c 8.4 (Berkeley) %G%"; +static char sccsid[] = "@(#)cmds.c 8.5 (Berkeley) %G%"; #endif /* not lint */ /* @@ -486,7 +486,7 @@ mput(argc, argv) for (i = 1; i < argc; i++) { char **cpp, **gargs; glob_t gl; - int gflags; + int flags; if (!doglob) { if (mflag && confirm(argv[0], argv[i])) { @@ -507,8 +507,8 @@ mput(argc, argv) } memset(&gl, 0, sizeof(gl)); - gflags = GLOB_BRACE|GLOB_QUOTE|GLOB_TILDE; - if (glob(argv[i], gflags, NULL, &gl) || gl.gl_pathc == 0) { + flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + if (glob(argv[i], flags, NULL, &gl) || gl.gl_pathc == 0) { warnx("%s: not found", argv[i]); globfree(&gl); continue; @@ -1516,12 +1516,14 @@ globulize(cpp) char **cpp; { glob_t gl; + int flags; if (!doglob) return (1); + flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); - if (glob(*cpp, GLOB_BRACE|GLOB_QUOTE|GLOB_TILDE, NULL, &gl) || + if (glob(*cpp, flags, NULL, &gl) || gl.gl_pathc == 0) { warnx("%s: not found", *cpp); globfree(&gl); -- 2.20.1