From e3ab4966cfce4669703d74c15914eba46cc3f288 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 2 Feb 2004 21:42:09 +0000 Subject: [PATCH] respect return code from glob() --- dtool/src/dtoolutil/filename.cxx | 4 ++++ ppremake/filename.cxx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dtool/src/dtoolutil/filename.cxx b/dtool/src/dtoolutil/filename.cxx index 35c653c5b2..12651e9fb5 100644 --- a/dtool/src/dtoolutil/filename.cxx +++ b/dtool/src/dtoolutil/filename.cxx @@ -1172,6 +1172,10 @@ scan_directory(vector_string &contents) const { glob_t globbuf; int r = glob(dirname.c_str(), GLOB_ERR, NULL, &globbuf); + if (r != 0 && r != GLOB_NOMATCH) { + perror(dirname.c_str()); + return false; + } size_t offset = dirname.size() - 1; for (int i = 0; globbuf.gl_pathv[i] != NULL; i++) { diff --git a/ppremake/filename.cxx b/ppremake/filename.cxx index 35c653c5b2..12651e9fb5 100644 --- a/ppremake/filename.cxx +++ b/ppremake/filename.cxx @@ -1172,6 +1172,10 @@ scan_directory(vector_string &contents) const { glob_t globbuf; int r = glob(dirname.c_str(), GLOB_ERR, NULL, &globbuf); + if (r != 0 && r != GLOB_NOMATCH) { + perror(dirname.c_str()); + return false; + } size_t offset = dirname.size() - 1; for (int i = 0; globbuf.gl_pathv[i] != NULL; i++) {