From 928225fb7bae2da375aa670e3c1b3007850aa4fb Mon Sep 17 00:00:00 2001 From: Jan Vidar Krey Date: Tue, 26 Jan 2010 08:40:10 +0100 Subject: [PATCH 1/2] On Mac OS X getrlimit() returns 2^(sizeof(size_t) * 8) instead of the actual number of available socket descriptors. --- src/network/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/network.c b/src/network/network.c index 39cf784..98aac83 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -69,7 +69,7 @@ size_t net_get_max_sockets() struct rlimit limits; if (getrlimit(RLIMIT_NOFILE, &limits) == 0) { - return limits.rlim_max; + return MIN(limits.rlim_max, 65536); } LOG_ERROR("getrlimit() failed"); return 1024; From 2d7ffa37feba265468d3f33ffcaba4ef4cb6cecb Mon Sep 17 00:00:00 2001 From: Jan Vidar Krey Date: Tue, 26 Jan 2010 16:16:41 +0100 Subject: [PATCH 2/2] Fix problem parsing configuration file if the last line is not empty --- src/util/misc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/misc.c b/src/util/misc.c index 5f88272..1273b39 100644 --- a/src/util/misc.c +++ b/src/util/misc.c @@ -225,7 +225,6 @@ int file_read_lines(const char* file, void* data, file_line_handler_t handler) if (*start) { - buf[strlen(start)] = 0; LOG_DUMP("Line: %s", start); if (handler(start, line_count+1, data) < 0) return -1;