From 84e8616c84124974b26ca398a8d2db4a2b96b70e Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Tue, 19 Jun 2001 10:00:25 +0000 Subject: [PATCH] try to handle GLOB_MAXPATH (FreeBSD) git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10127 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftpd/ftpd.c | 8 +++++++- appl/ftp/ftpd/popen.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c index 698c93a44..c38eaffd8 100644 --- a/appl/ftp/ftpd/ftpd.c +++ b/appl/ftp/ftpd/ftpd.c @@ -2165,7 +2165,13 @@ send_file_list(char *whichf) char buf[MaxPathLen]; if (strpbrk(whichf, "~{[*?") != NULL) { - int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|GLOB_LIMIT; + int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE| +#ifdef GLOB_MAXPATH + GLOB_MAXPATH +#else + GLOB_LIMIT +#endif + ; memset(&gl, 0, sizeof(gl)); freeglob = 1; diff --git a/appl/ftp/ftpd/popen.c b/appl/ftp/ftpd/popen.c index f4125e349..0f459f478 100644 --- a/appl/ftp/ftpd/popen.c +++ b/appl/ftp/ftpd/popen.c @@ -139,7 +139,13 @@ 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 - | GLOB_LIMIT; + | +#ifdef GLOB_MAXPATH + GLOB_MAXPATH +#else + GLOB_LIMIT +#endif + ; memset(&gl, 0, sizeof(gl)); if (no_glob || glob(argv[argc], flags, NULL, &gl))