aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-05-27 19:31:50 -0400
committerBoris Kolpackov <boris@codesynthesis.com>2013-05-27 19:31:50 -0400
commit3e3ca63ff60088784e1eab79c529ebf1802af8f1 (patch)
treeaabdf093a76f55e5c3f46d175ae9b4403197199a
parent3df463d5363949976a72821cf91e9e152aa0a728 (diff)
Fix bug in default options file search logic
-rw-r--r--odb/odb.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/odb/odb.cxx b/odb/odb.cxx
index 9491252..dcddf96 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -252,6 +252,7 @@ main (int argc, char* argv[])
//
if (file.relative ())
{
+ bool found (false);
path dd (driver_path (path (argv[0])).directory ());
for (path d (dd);; d = d.directory ())
@@ -263,6 +264,7 @@ main (int argc, char* argv[])
if (stat (f.string ().c_str (), &s) == 0 && S_ISREG (s.st_mode))
{
file = f;
+ found = true;
break;
}
@@ -270,8 +272,8 @@ main (int argc, char* argv[])
break;
}
- if (file.relative ())
- file = dd / file;
+ if (!found)
+ file = dd / file; // For diagnostics.
}
int ac (3);