From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Aug 2022 14:06:23 +0000 (+0100)
Subject: prefork-interp: ship?
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=cd882fb0de3c5f2b09019cb6dd0eccc5318cbe6e;p=chiark-utils.git

prefork-interp: ship?

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/scripts/Makefile b/scripts/Makefile
index 3ab02e7..a521265 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -31,7 +31,7 @@ MANPAGES1=	palm-datebook-reminders
 CSCRIPTS=	named-conf
 CMANPAGES8=	named-conf
 
-PERLMODULES=	Chiark/NNTP
+PERLMODULES=	Chiark/NNTP Proc/Prefork/Interp
 
 all:
 
diff --git a/pm/Proc/Prefork/Interp.pm b/scripts/Proc/Prefork/Interp.pm
similarity index 99%
rename from pm/Proc/Prefork/Interp.pm
rename to scripts/Proc/Prefork/Interp.pm
index 9c4bc6a..04b536e 100644
--- a/pm/Proc/Prefork/Interp.pm
+++ b/scripts/Proc/Prefork/Interp.pm
@@ -312,7 +312,7 @@ sub initialisation_complete {
       $child = fork // fail_log("fork for accepted call failed: $!");
       if (!$child) {
 	#---- monitor [1] ----
-	local $0 = "$0 [monitor]";
+	$0 =~ s{ \[server\]$}{ [monitor]};
 	return become_monitor();
       }
       close(CALL);
diff --git a/pm/Proc/Prefork/prefork-interp-test b/scripts/prefork-interp-test
old mode 100755
new mode 100644
similarity index 94%
rename from pm/Proc/Prefork/prefork-interp-test
rename to scripts/prefork-interp-test
index 2db267e..c789410
--- a/pm/Proc/Prefork/prefork-interp-test
+++ b/scripts/prefork-interp-test
@@ -2,7 +2,7 @@
 # -*- perl -*-
 
 use strict;
-BEGIN { unshift @INC, './pm' }
+BEGIN { unshift @INC, './perl' }
 use Proc::Prefork::Interp;
 
 sub prwhen ($) {