From 063bc2b80af6f076c4f72df7c7b2b2af54af7c1e Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 26 Mar 2001 11:41:16 +0000 Subject: [PATCH] always use GLOB_LIMIT git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9775 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftpd/ftpd.c | 6 +----- appl/ftp/ftpd/popen.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c index 1f709f081..829e100bb 100644 --- a/appl/ftp/ftpd/ftpd.c +++ b/appl/ftp/ftpd/ftpd.c @@ -2161,11 +2161,7 @@ send_file_list(char *whichf) char buf[MaxPathLen]; if (strpbrk(whichf, "~{[*?") != NULL) { - int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE -#ifdef GLOB_LIMIT - | GLOB_LIMIT -#endif - ; + int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|GLOB_LIMIT; memset(&gl, 0, sizeof(gl)); freeglob = 1; diff --git a/appl/ftp/ftpd/popen.c b/appl/ftp/ftpd/popen.c index 3162eb36e..f4125e349 100644 --- a/appl/ftp/ftpd/popen.c +++ b/appl/ftp/ftpd/popen.c @@ -139,10 +139,7 @@ ftpd_popen(char *program, char *type, int do_stderr, int no_glob) for (gargc = argc = 1; argv[argc] && gargc < MAXGLOBS - 1; argc++) { glob_t gl; int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE -#ifdef GLOB_LIMIT - | GLOB_LIMIT -#endif - ; + | GLOB_LIMIT; memset(&gl, 0, sizeof(gl)); if (no_glob || glob(argv[argc], flags, NULL, &gl))