$NetBSD: patch-am,v 1.1 2006/12/12 19:31:37 joerg Exp $ --- src/celutil/unixdirectory.cpp.orig 2006-12-12 16:52:18.000000000 +0000 +++ src/celutil/unixdirectory.cpp @@ -7,11 +7,19 @@ // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. +#if defined(__DragonFly__) +#define NO_WORDEXP +#endif + #include #include #include #include +#ifdef NO_WORDEXP +#include +#else #include +#endif #include "directory.h" using namespace std; @@ -98,6 +106,19 @@ bool IsDirectory(const std::string& file } std::string WordExp(const std::string& filename) { +#ifdef NO_WORDEXP + glob_t g; + std::string expanded; + glob(filename.c_str(), GLOB_NOSORT | GLOB_TILDE, NULL, &g); + if (g.gl_matchc != 1) { + globfree(&g); + return filename; + } else { + expanded = g.gl_pathv[0]; + globfree(&g); + return expanded; + } +#else wordexp_t result; std::string expanded; @@ -121,4 +142,5 @@ std::string WordExp(const std::string& f wordfree(&result); return expanded; +#endif }