On Tue, 2011-11-01 at 22:30 +0100, Guillem Jover wrote:
> On Tue, 2011-11-01 at 15:57:53 +0100, Svante Signell wrote:
..
> __USE_BSD is an internal macro used by glibc and should not be relied
> on. Add a check to configure.ac instead, something like this:
>
> AC_CHECK_FUNCS([getdtablesize])
Ok, done!
> and then use HAVE_GETDTABLESIZE. Also if there's no limit (-1) it's a
> bit harsh to exit(1). I'd code this for example like:
I did not realize that -1 meant unlimited, where is this written? I
thought it indicated an error.
RETURN VALUE
The current limit on the number of open files per process.
ERRORS
On Linux, getdtablesize() can return any of the errors described
for getrlimit(2); see NOTES below.
I expected the gettablesize to return a value of -1 indicating an error.
Updated patch attached, OK now?
diff -ur uptimed-0.3.16/configure.ac uptimed-0.3.16.modified/configure.ac
--- uptimed-0.3.16/configure.ac 2009-01-02 00:46:00.000000000 +0100
+++ uptimed-0.3.16.modified/configure.ac 2011-11-01 22:45:58.000000000 +0100
@@ -31,6 +31,9 @@
*-darwin*)
AC_DEFINE(PLATFORM_BSD, 1, [Define if you are compiling for *BSD])
;;
+ *-gnu*)
+ AC_DEFINE(PLATFORM_GNU, 1, [Define if you are compiling for *GNU])
+ ;;
*)
AC_DEFINE(PLATFORM_UNKNOWN, 1, [Define if you are compiling for an unknown system])
;;
@@ -38,6 +41,7 @@
AC_REPLACE_FUNCS(getopt)
AC_CHECK_HEADERS(getopt.h)
+AC_CHECK_FUNCS([getdtablesize])
AC_OUTPUT([Makefile libuptimed/Makefile src/Makefile man/Makefile etc/Makefile uptimed.spec])
diff -ur uptimed-0.3.16/src/uptimed.c uptimed-0.3.16.modified/src/uptimed.c
--- uptimed-0.3.16/src/uptimed.c 2009-01-02 00:46:00.000000000 +0100
+++ uptimed-0.3.16.modified/src/uptimed.c 2011-11-01 23:00:14.000000000 +0100
@@ -175,7 +175,7 @@
void bg(void)
{
- int i;
+ int i, fdmax;
/* Simple fork to run proces in the background. */
switch(fork())
{
@@ -192,7 +192,15 @@
}
/* Close probably all file descriptors */
- for (i = 0; i<NOFILE; i++)
+#ifdef HAVE_GETDTABLESIZE
+ fdmax = getdtablesize();
+#else
+ fdmax = sysconf(_SC_OPEN_MAX);
+#endif
+ if (fdmax <= 0)
+ fdmax = 3;
+
+ for (i = 0; i < fdmax; i++)
close(i);
/* Be nice to umount */
diff -ur uptimed-0.3.16/debian/patches/series uptimed-0.3.16.modified/debian/patches/series
--- uptimed-0.3.16/debian/patches/series 2011-11-01 16:13:22.000000000 +0100
+++ uptimed-0.3.16.modified/debian/patches/series 2011-11-01 16:24:54.000000000 +0100
@@ -1,3 +1,4 @@
+fix_FTBFS4Hurd.patch
no-bootid-file-on-linux.patch
uprecords-cgi-header-path.patch
uprecords-cgi-header-text-color.patch
