[Guessnet-devel] [svn] r144 - in trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Thu Nov 10 15:20:33 2005
New Revision: 144

Modified:
   trunk/   (props changed)
   trunk/README
   trunk/configure.ac
   trunk/debian/changelog
   trunk/src/ProcessRunner.cc
Log:
 r5811 at viaza:  enrico | 2005-11-10 16:20:29 +0100
 Fixed ProcessRunner to check for +x only the executable file, not the entire commandline.  Thanks to Jean-Damien Durand!


Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Thu Nov 10 15:20:33 2005
@@ -406,6 +406,12 @@
 DONE
 ====
 
+ * Done in version 0.38
+ 
+ + Applied patch from Jean-Damien Durand to get scripts with arguments to work
+   again.
+
+ 
  * Done in version 0.36
 
  + Implemented peer test without destination IP, to test for the existance of

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Nov 10 15:20:33 2005
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(guessnet, 0.37, [enrico at debian.org])
+AC_INIT(guessnet, 0.38, [enrico at debian.org])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([foreign])

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu Nov 10 15:20:33 2005
@@ -1,3 +1,10 @@
+guessnet (0.38-1) unstable; urgency=low
+
+  * New upstream version.
+    + Applied patch from Jean-Damien Durand.  Closes: #337199, #336640.
+
+ -- Enrico Zini <enrico at debian.org>  Thu, 10 Nov 2005 16:16:19 +0100
+
 guessnet (0.37-1) unstable; urgency=low
 
   [ Thomas Hood ]

Modified: trunk/src/ProcessRunner.cc
==============================================================================
--- trunk/src/ProcessRunner.cc	(original)
+++ trunk/src/ProcessRunner.cc	Thu Nov 10 15:20:33 2005
@@ -39,8 +39,10 @@
 //#define DEBUG(args...) fprintf(stderr, ##args)
 #define DEBUG(args...) do {} while(0)
 
-static bool canRun(const string& file)
+static bool canRun(const string& cmdline)
 {
+	size_t pos = cmdline.find(' ');
+	string file = pos == string::npos ? cmdline : cmdline.substr(0, pos);
 	return access(file.c_str(), X_OK) != -1;
 }
 
@@ -79,7 +81,7 @@
 			cmd = string(SCRIPTDIR) + "/" + cmdline;
 		}
 		if (!canRun(cmd))
-			throw SystemException(errno, "checking if " + cmd + " is executable");
+			throw SystemException(errno, "checking if " + cmd + " can be executed");
 		runner.addArg(cmd);
 
 		DEBUG("SCRIPT MAIN Running %.*s\n", PFSTR(cmdline));