const char our_name[] = "prefork-interp";
-struct sockaddr_un sun;
+struct sockaddr_un sockaddr_sun;
#define ACK_BYTE '\n'
-static struct sockaddr_un socket_sun;
static const char *const *executor_argv;
void fusagemessage(FILE *f) {
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd==-1) diee("socket() for client");
- socklen_t salen = sizeof(sun);
- r = connect(fd, (const struct sockaddr*)&socket_sun, salen);
+ socklen_t salen = sizeof(sockaddr_sun);
+ r = connect(fd, (const struct sockaddr*)&sockaddr_sun, salen);
if (r==-1) {
if (errno==ECONNREFUSED || errno==ENOENT) goto x_garbage;
diee("connect() %s", socket_path);
int sfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sfd<0) diee("socket() for new listener");
- socklen_t salen = sizeof(sun);
- r= bind(sfd, (const struct sockaddr*)&socket_sun, salen);
+ socklen_t salen = sizeof(sockaddr_sun);
+ r= bind(sfd, (const struct sockaddr*)&sockaddr_sun, salen);
if (r<0) diee("bind() on new listener");
// We never want callers to get ECONNREFUSED. But:
make_executor_argv(argv);
find_socket_path();
- FILLZERO(sun);
- sun.sun_family = AF_UNIX;
- assert(strlen(socket_path) <= sizeof(sun.sun_path));
- strncpy(sun.sun_path, socket_path, sizeof(sun.sun_path));
+ FILLZERO(sockaddr_sun);
+ sockaddr_sun.sun_family = AF_UNIX;
+ assert(strlen(socket_path) <= sizeof(sockaddr_sun.sun_path));
+ strncpy(sockaddr_sun.sun_path, socket_path, sizeof(sockaddr_sun.sun_path));
FILE *call_sock = connect_or_spawn();
uint32_t status;
BEGIN { unshift @INC, '.' }
use Proc::Prefork;
-print STDERR "BEGIN - STDERR\n" and flush STDERR or die $!;
-print STDOUT "BEGIN - STDOUT\n" and flush STDOUT or die $!;
+print STDERR "BEGIN - STDERR - @ARGV\n" and flush STDERR or die $!;
+print STDOUT "BEGIN - STDOUT - @ARGV\n" and flush STDOUT or die $!;
initialisation_complete();
-print STDERR "AFTER - STDERR\n" and flush STDERR or die $!;
-print STDOUT "AFTER - STDOUT\n" and flush STDOUT or die $!;
+print STDERR "AFTER - STDERR - @ARGV\n" and flush STDERR or die $!;
+print STDOUT "AFTER - STDOUT - @ARGV\n" and flush STDOUT or die $!;
while (<STDIN>) {
last unless m{\S};