blob: f0c73ce64a8e78adafd81ded6a99c5af4cb16f59 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- base/src/utility.cpp.orig 2004-02-10 18:20:22 UTC
+++ base/src/utility.cpp
@@ -56,7 +56,7 @@ using namespace std;
#include "win32impl.h"
#include "browser.h"
#include <unistd.h>
-#include <wordexp.h>
+#include <glob.h>
#define MKDIR(z) mkdir(z, 0755)
#define _stat stat
#ifndef _S_IFDIR
@@ -825,13 +825,13 @@ SplitPath(const string& path)
if (subpath.size()) {
#ifndef WIN32
- wordexp_t result;
- if (wordexp(subpath.c_str(), &result, 0) ==0){
+ glob_t result;
+ if (glob(subpath.c_str(), 0, NULL, &result) ==0){
//cerr << "Expanded " << dir << " in ";
- subpath = result.we_wordv[0];
+ subpath = result.gl_pathv[0];
//cerr << dir << endl;
}
- wordfree(&result);
+ globfree(&result);
#endif
dirs.push_back(subpath);
|