crossroads

commit df9b007de4b861522a2ccf83ed168e01f4fddef1
parent 53ff91b87b0a08a521ed7e694dc9def36efd8e6c
Author: finwo <finwo@pm.me>
Date:   Sat,  3 Jan 2026 19:37:09 +0100

2.41

Diffstat:
M
ChangeLog
 | 
3
+++
M
Makefile
 | 
2
+-
M
xrctl/xrctl
 | 
4
++--

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2.41 [KK 2009-01-05]
+- Bugfix in xrctl, thanks Eddie for reporting it.    
+
 2.40 [KK 2009-01-03] 
 - Netbuffer::read() failures are no longer logged as errors, but as
   verbose messages.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Top-level Makefile for XR
 # -------------------------
 
-VER	   = 2.40
+VER	   = 2.41
 PREFIX	   = $(DESTDIR)/usr
 BINDIR	   = $(PREFIX)/sbin
 MANDIR	   = $(PREFIX)/share/man
diff --git a/xrctl/xrctl b/xrctl/xrctl
@@ -307,7 +307,7 @@ sub is_running {
 	chomp ($line);
 	$line =~ s/^\s*//;
 	my ($pid, $cmd) = split(/\s+/, $line);
-	msg("Command '$cmd' at pid '$pid' (line $line)\n");
+	# msg("Command '$cmd' at pid '$pid' (line $line)\n");
 	if ($cmd =~ /^xr-$s/) {
 	    push (@ret, $pid);
 	    msg ("Candidate PID: $pid\n");
@@ -363,7 +363,7 @@ sub find_bin {
     my $bin = shift;
     my @parts = split (/\s/, $bin);
     for my $d (split (/:/, $sysconf{path})) {
-	if (-x "$d/$parts[0]") {
+	if (-x "$d/$parts[0]" and -f "$d/$parts[0]") {
 	    msg ("Binary '$parts[0]' found as '$d/$parts[0]'\n");
 	    $parts[0] = "$d/$parts[0]";
 	    return (join (' ', @parts));