From d8971f1a17b39f67dc08c1d853bae3958adb331d Mon Sep 17 00:00:00 2001 From: axel Date: Tue, 27 Sep 2005 18:35:07 +1000 Subject: [PATCH] Silence universal variable server error reporting darcs-hash:20050927083507-ac50b-7ea60eb35b5965e53ff2f70cd4d5eb0221bd0791.gz --- env.c | 2 +- env_universal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/env.c b/env.c index 5d537b408..dd79b4231 100644 --- a/env.c +++ b/env.c @@ -43,7 +43,7 @@ /** Command used to start fishd */ -#define FISHD_CMD L"fishd ^/tmp/fish.%s.log" +#define FISHD_CMD L"if which fishd >/dev/null; fishd ^/tmp/fish.%s.log; end" #define ENV_NULL L"\x1d" diff --git a/env_universal.c b/env_universal.c index 26dc429bd..4d8bc09d8 100644 --- a/env_universal.c +++ b/env_universal.c @@ -273,7 +273,7 @@ void env_universal_barrier() message_t *msg; fd_set fds; - if( !init ) + if( !init || ( env_universal_server.fd == -1 )) return; barrier_reply = 0;