aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2011-03-25 12:27:58 -0500
committerPeter Seebach <peter.seebach@windriver.com>2011-03-25 12:27:58 -0500
commit009f439df0dc7b298f91ca67cccadde58b0327b1 (patch)
tree3ea6e8e076279dcd8c2a4dada35eea6397b2a2a0
parenta15f432fd27d3a061369dca724d541394be20d49 (diff)
parent96d8e7ce8b483e5cafd0449b9735e4714f41f20b (diff)
downloadpseudo-PSEUDO_PORTS_REMIX.tar.gz
pseudo-PSEUDO_PORTS_REMIX.tar.bz2
pseudo-PSEUDO_PORTS_REMIX.zip
Merge commit '96d8e7ce8b483e5cafd0449b9735e4714f41f20b' into PSEUDO_PORTS_REMIXPSEUDO_PORTS_REMIX
Conflicts: ChangeLog.txt
-rw-r--r--ChangeLog.txt3
-rw-r--r--pseudo_client.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index fa05d18..5643e1f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2011-03-25:
+ * (seebs) don't try to search path when you don't have one
+
2011-03-24:
* (seebs) more work on OS X port.
* (seebs) include errno in the verbose debug output
diff --git a/pseudo_client.c b/pseudo_client.c
index 7ac96dd..b53ee25 100644
--- a/pseudo_client.c
+++ b/pseudo_client.c
@@ -1378,7 +1378,7 @@ pseudo_exec_path(const char *filename, int search_path) {
return candidate;
}
- if (!search_path) {
+ if (!search_path || !path_segs) {
candidate = pseudo_fix_path(pseudo_cwd, filename, 0, pseudo_cwd_len, NULL, 0);
/* executable or not, it's the only thing we can try */
pseudo_magic();