fprintf(stderr,"\
Syntax: %s {-1|--start} [{-T|--start-command-timeout} <start-command-timeout>]\n\
\t[{-l|--lock} <filename>] [-S|--syslog] [-e|--stderr]\n\
- \t\[-I|--ignore-spawned-command-output]\n\
+ \t[-I|--ignore-spawned-command-output]\n\
\t{-p|--port} <server-port> <start-server-command>\n\
or %s {-0|--stop} [{-i|--idle-server-timeout} <idle-server-timeout>]\n\
\t[{-l|--lock} <filename>] [-S|--syslog] [-e|--stderr]\n\
- \t\[-I|--ignore-spawned-command-output]\n\
+ \t[-I|--ignore-spawned-command-output]\n\
\t<stop-server-command>\n\
\n\
Error messages are printed to stderr by default,\n\
{
struct pollfd pollfdi[2];
int pollfdo[2];
-const char *pollfdi_name[2];
+const char *pollfd_name[2];
int fdi,fdo;
pollfdi[0].fd=conn0_fdin;
pollfdi[1].events=POLLIN;
pollfdo[0]=conn0_fdout;
pollfdo[1]=conn1_fdout;
- pollfdi_name[0]=conn0_name;
- pollfdi_name[1]=conn1_name;
+ pollfd_name[0]=conn0_name;
+ pollfd_name[1]=conn1_name;
for (;;) {
if (0>=poll(pollfdi,G_N_ELEMENTS(pollfdi),-1))
- fatal("poll(%s socket,%s socket): %m",pollfdi_name[0],pollfdi_name[1]);
+ fatal("poll(%s socket,%s socket): %m",pollfd_name[0],pollfd_name[1]);
for (fdi=0;fdi<G_N_ELEMENTS(pollfdi);fdi++)
if (0
|| pollfdi[fdi].revents & (POLLERR|POLLHUP|POLLNVAL)
|| ((pollfdi[fdi].revents & POLLIN) && !(pollfdi[fdi].events & POLLIN))
)
fatal("poll(%s socket): revents=0x%X (events=0x%X)",
- pollfdi_name[fdi],(unsigned)pollfdi[fdi].revents,
+ pollfd_name[fdi],(unsigned)pollfdi[fdi].revents,
(unsigned)pollfdi[fdi].events);
for (fdi=0;fdi<G_N_ELEMENTS(pollfdi);fdi++) {
for (;;) {
char buf[SESSION_BUFFER_SIZE];
if (fcntl(pollfdi[fdi].fd,F_SETFL,O_NONBLOCK))
- fatal("fcntl(%s socket,F_SETFL,O_NONBLOCK): %m",pollfdi_name[fdi]);
+ fatal("fcntl(%s socket,F_SETFL,O_NONBLOCK): %m",pollfd_name[fdi]);
got=read(pollfdi[fdi].fd,buf,sizeof(buf));
if (got<0) {
if (errno==EAGAIN)
break;
- fatal("read(%s socket): %m",pollfdi_name[fdi]);
+ fatal("read(%s socket): %m",pollfd_name[fdi]);
}
if (got==0) {
lock_close();
exit(EXIT_SUCCESS);
}
- for (fdo=0;fdo<G_N_ELEMENTS(pollfdi);fdo++) {
+ for (fdo=0;fdo<G_N_ELEMENTS(pollfdo);fdo++) {
if (fdi==fdo)
continue;
- if (fcntl(pollfdi[fdo].fd,F_SETFL,0 /* !O_NONBLOCK */))
+ if (fcntl(pollfdo[fdo],F_SETFL,0 /* !O_NONBLOCK */))
fatal("fcntl(%s socket,F_SETFL,0 /* !O_NONBLOCK */): %m",
- pollfdi_name[fdo]);
- if (got!=write(pollfdi[fdo].fd,buf,got))
+ pollfd_name[fdo]);
+ if (got!=write(pollfdo[fdo],buf,got))
fatal("write(%s socket,%ld): %m",
- pollfdi_name[fdo],(long)got);
+ pollfd_name[fdo],(long)got);
}
}
}