* userv - execserv.c
* daemon code which executes actual service (ie child process)
*
- * Copyright (C)1996-1997,1999 Ian Jackson
+ * Copyright (C)1996-1997,1999-2001,2003 Ian Jackson
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by
"-",
0
};
- int fd, realfd, holdfd, newfd, r, envvarbufsize=0, targ, nargs, i, l;
+ int fd, realfd, holdfd, newfd, r, envvarbufsize=0, targ, nargs, i, l, fdflags;
char *envvarbuf=0;
const char **args, *const *cpp;
char *const *pp;
if (close(clientfd)) serv_syscallfail("close client socket fd");
- /* Now we have to make all the fd's work. It's rather a complicated
+ /* First we need to close the holding writing ends of the pipes
+ * inherited from our parent: */
+ for (fd=0; fd<fdarrayused; fd++) {
+ if (fdarray[fd].holdfd == -1) continue;
+ if (close(fdarray[fd].holdfd)) serv_syscallfail("close pipe hold fd");
+ fdarray[fd].holdfd= -1;
+ }
+ /* Now we can reuse the .holdfd member of the fdarray entries. */
+
+ /* We have to make all the fd's work. It's rather a complicated
* algorithm, unfortunately. We remember in holdfd[fd] whether fd
* is being used to hold a file descriptor we actually want for some
* other real fd in the service program; holdfd[fd] contains the fd
* holdfd tells us we're currently storing some other fd in there we
* move it out of the way with dup and record its new location.
*/
- for (fd=0; fd<fdarrayused; fd++) {
- if (fdarray[fd].holdfd == -1) continue;
- if (close(fdarray[fd].holdfd)) serv_syscallfail("close pipe hold fd");
- fdarray[fd].holdfd= -1;
- }
for (fd=0; fd<fdarrayused; fd++) {
if (fdarray[fd].realfd < fdarrayused && fdarray[fd].realfd >= 0)
fdarray[fdarray[fd].realfd].holdfd= fd;
}
if (dup2(fdarray[fd].realfd,fd)<0) serv_syscallfail("dup2 set up fd");
if (close(fdarray[fd].realfd)) serv_syscallfail("close old fd");
- if (fcntl(fd,F_SETFD,0)<0) serv_syscallfail("set no-close-on-exec on fd");
+ fdflags= fcntl(fd,F_GETFD); if (fdflags<0) serv_syscallfail("get fd flags");
+ if (fcntl(fd,F_SETFD,fdflags&~FD_CLOEXEC)==-1) serv_syscallfail("set no-close-on-exec on fd");
fdarray[fd].realfd= fd;
}