[Pkg-electronics-commits] [gnucap] 26/43: plugpath-bug: fix bug in prepare_env

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository gnucap.

commit 0b8e642b2f75fcd0ef588477f8dbf5d331f6b0a0
Author: al davis <ad211 at freeelectron.net>
Date:   Thu May 11 20:27:16 2017 -0400

    plugpath-bug:  fix bug in prepare_env
    
    was causing load default plugins to fail when current directory is where plugins are.
---
 include/patchlev.h | 2 +-
 main/main.cc       | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/patchlev.h b/include/patchlev.h
index 1de38e1..c395aac 100644
--- a/include/patchlev.h
+++ b/include/patchlev.h
@@ -1 +1 @@
-#define PATCHLEVEL "unstable 2017.04.18"
+#define PATCHLEVEL "plugpath-bug 2017.05.11"
diff --git a/main/main.cc b/main/main.cc
index 01e2156..9801815 100644
--- a/main/main.cc
+++ b/main/main.cc
@@ -1,4 +1,4 @@
-/*$Id: main.cc 2016/09/11 al $ -*- C++ -*-
+/*$Id: main.cc  $ -*- C++ -*-
  * Copyright (C) 2001 Albert Davis
  * Author: Albert Davis <aldavis at gnu.org>
  *
@@ -59,7 +59,12 @@ static void prepare_env()
                               "\0         (reserved space)                 ";
 
   std::string ldlpath = OS::getenv("LD_LIBRARY_PATH");
-  OS::setenv("GNUCAP_PLUGPATH", ldlpath + ':' + (plugpath+9), false);
+  if (ldlpath != "") {untested();
+    ldlpath += ":";
+  }else{
+  }
+  assert(strlen("PLUGPATH=") == 9);
+  OS::setenv("GNUCAP_PLUGPATH", ldlpath + (plugpath+9), false);
 }
 /*--------------------------------------------------------------------------*/
 static void read_startup_files(void)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git