[dovecot-cvs] dovecot/src/lib fd-close-on-exec.c,NONE,1.1 fd-close-on-exec.h,NONE,1.1 Makefile.am,1.16,1.17

cras at procontrol.fi cras at procontrol.fi
Sun Dec 1 17:39:23 EET 2002


Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv1500/src/lib

Modified Files:
	Makefile.am 
Added Files:
	fd-close-on-exec.c fd-close-on-exec.h 
Log Message:
We use close-on-exec flag now to make sure that master process closes the
fds when executing other processes.



--- NEW FILE: fd-close-on-exec.c ---
/*
    Copyright (c) 2002 Timo Sirainen

    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
    "Software"), to deal in the Software without restriction, including
    without limitation the rights to use, copy, modify, merge, publish,
    distribute, sublicense, and/or sell copies of the Software, and to
    permit persons to whom the Software is furnished to do so, subject to
    the following conditions:

    The above copyright notice and this permission notice shall be
    included in all copies or substantial portions of the Software.

    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include "lib.h"
#include "fd-close-on-exec.h"

#include <unistd.h>
#include <fcntl.h>

void fd_close_on_exec(int fd, int set)
{
	int flags;

	flags = fcntl(fd, F_GETFD, 0);
	if (flags < 0)
		i_fatal("fcntl(F_GETFD) failed: %m");

	flags = set ? (flags | FD_CLOEXEC) : (flags & ~FD_CLOEXEC);
	if (fcntl(fd, F_SETFD, flags) < 0)
		i_fatal("fcntl(F_SETFD) failed: %m");
}

void fd_debug_verify_leaks(int first_fd, int last_fd)
{
	while (first_fd < last_fd) {
		if (fcntl(first_fd, F_GETFD, 0) != -1 || errno != EBADF)
			i_fatal("Leaked file descriptor: %d", first_fd);
		first_fd++;
	}
}

--- NEW FILE: fd-close-on-exec.h ---
#ifndef __FD_CLOSE_ON_EXEC_H
#define __FD_CLOSE_ON_EXEC_H

/* Change close-on-exec flag of fd. */
void fd_close_on_exec(int fd, int set);

/* Verify that fds in given range don't exist. */
void fd_debug_verify_leaks(int first_fd, int last_fd);

#endif

Index: Makefile.am
===================================================================
RCS file: /home/cvs/dovecot/src/lib/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	1 Dec 2002 13:48:50 -0000	1.16
+++ Makefile.am	1 Dec 2002 15:39:20 -0000	1.17
@@ -7,6 +7,7 @@
 	data-stack.c \
 	env-util.c \
 	failures.c \
+	fd-close-on-exec.c \
 	fdpass.c \
 	file-lock.c \
 	file-set-size.c \
@@ -54,6 +55,7 @@
 	data-stack.h \
 	env-util.h \
 	failures.h \
+	fd-close-on-exec.h \
 	fdpass.h \
 	file-lock.h \
 	file-set-size.h \




More information about the dovecot-cvs mailing list