[PATCH] Include headers for getrlimit() in sha1_file.c

[PATCH] Include headers for getrlimit() in sha1_file.c

[Stefan Sperling]

Fixes compilation error on OpenBSD:
sha1_file.c: In function 'open_packed_git_1':
sha1_file.c:718: error: storage size of 'lim' isn't known
sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
sha1_file.c:718: warning: unused variable 'lim'

Signed-off-by: Stefan Sperling <stsp@stsp.name>
---
 sha1_file.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index b4fcca8..f969b10 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -18,6 +18,10 @@
 #include "pack-revindex.h"
 #include "sha1-lookup.h"
 
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
 #define O_NOATIME 01000000
-- 
1.7.3.5

Re: [PATCH] Include headers for getrlimit() in sha1_file.c

[Jonathan Nieder]

(+cc: Shawn, Erik)
Hi Stefan,

Stefan Sperling wrote:

> Fixes compilation error on OpenBSD:
> sha1_file.c: In function 'open_packed_git_1':
> sha1_file.c:718: error: storage size of 'lim' isn't known
> sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
> sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
> sha1_file.c:718: warning: unused variable 'lim'

Good catch.

> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -18,6 +18,10 @@
>  #include "pack-revindex.h"
>  #include "sha1-lookup.h"
>  
> +#include <sys/types.h>
> +#include <sys/time.h>
> +#include <sys/resource.h>

System headers like this tend to go in git-compat-util.h, so
portability fixes having to do with compatibility replacements or
order of inclusion only need to happen in one place.

In this case, afaict sys/resource.h is not available on mingw, meaning
the #include would probably go in the "#ifndef __MINGW32__" block.
Maybe something like this (untested)?

-- 8< --
Subject: compat: add missing #include <sys/resource.h>

Starting with commit c793430 (Limit file descriptors used by packs,
2011-02-28), git uses getrlimit to tell how many file descriptors it
can use.  Unfortunately it does not include the header declaring that
function, resulting in compilation errors on OpenBSD:

 sha1_file.c: In function 'open_packed_git_1':
 sha1_file.c:718: error: storage size of 'lim' isn't known
 sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
 sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
 sha1_file.c:718: warning: unused variable 'lim'

The standard header to include for this is <sys/resource.h> (which on
some systems itself requires declarations from <sys/types.h> or
<sys/time.h>).  Probably the problem was missed until now because in
current glibc sys/resource.h happens to be included by sys/wait.h.

MinGW does not provide sys/resource.h (and compat/mingw takes care of
providing getrlimit some other way), so add the missing #include to
the "#ifndef __MINGW32__" block in git-compat-util.h.

Reported-by: Stefan Sperling <stsp@stsp.name>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 git-compat-util.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index 49b50ee..40498b3 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -118,6 +118,7 @@
 #endif
 #ifndef __MINGW32__
 #include <sys/wait.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <termios.h>
-- 
1.7.4.1

Re: [PATCH] Include headers for getrlimit() in sha1_file.c

[Arnaud Lacombe]

Hi,

On Fri, Mar 18, 2011 at 4:23 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> (+cc: Shawn, Erik)
> Hi Stefan,
>
> Stefan Sperling wrote:
>
>> Fixes compilation error on OpenBSD:
>> sha1_file.c: In function 'open_packed_git_1':
>> sha1_file.c:718: error: storage size of 'lim' isn't known
>> sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
>> sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
>> sha1_file.c:718: warning: unused variable 'lim'
>
This also fix the build on FreeBSD 8 (did not test other version).

 - Arnaud

> Good catch.
>
>> --- a/sha1_file.c
>> +++ b/sha1_file.c
>> @@ -18,6 +18,10 @@
>>  #include "pack-revindex.h"
>>  #include "sha1-lookup.h"
>>
>> +#include <sys/types.h>
>> +#include <sys/time.h>
>> +#include <sys/resource.h>
>
> System headers like this tend to go in git-compat-util.h, so
> portability fixes having to do with compatibility replacements or
> order of inclusion only need to happen in one place.
>
> In this case, afaict sys/resource.h is not available on mingw, meaning
> the #include would probably go in the "#ifndef __MINGW32__" block.
> Maybe something like this (untested)?
>
> -- 8< --
> Subject: compat: add missing #include <sys/resource.h>
>
> Starting with commit c793430 (Limit file descriptors used by packs,
> 2011-02-28), git uses getrlimit to tell how many file descriptors it
> can use.  Unfortunately it does not include the header declaring that
> function, resulting in compilation errors on OpenBSD:
>
>  sha1_file.c: In function 'open_packed_git_1':
>  sha1_file.c:718: error: storage size of 'lim' isn't known
>  sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
>  sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
>  sha1_file.c:718: warning: unused variable 'lim'
>
> The standard header to include for this is <sys/resource.h> (which on
> some systems itself requires declarations from <sys/types.h> or
> <sys/time.h>).  Probably the problem was missed until now because in
> current glibc sys/resource.h happens to be included by sys/wait.h.
>
> MinGW does not provide sys/resource.h (and compat/mingw takes care of
> providing getrlimit some other way), so add the missing #include to
> the "#ifndef __MINGW32__" block in git-compat-util.h.
>
> Reported-by: Stefan Sperling <stsp@stsp.name>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
>  git-compat-util.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 49b50ee..40498b3 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -118,6 +118,7 @@
>  #endif
>  #ifndef __MINGW32__
>  #include <sys/wait.h>
> +#include <sys/resource.h>
>  #include <sys/socket.h>
>  #include <sys/ioctl.h>
>  #include <termios.h>
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH] Include headers for getrlimit() in sha1_file.c

[Stefan Sperling]

On Fri, Mar 18, 2011 at 03:23:52PM -0500, Jonathan Nieder wrote:
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 49b50ee..40498b3 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -118,6 +118,7 @@
>  #endif
>  #ifndef __MINGW32__
>  #include <sys/wait.h>
> +#include <sys/resource.h>
>  #include <sys/socket.h>
>  #include <sys/ioctl.h>
>  #include <termios.h>

Works for me. Thanks.

[PATCH maint resend] compat: add missing #include <sys/resource.h>

[Jonathan Nieder]

Date: Fri, 18 Mar 2011 15:23:52 -0500

Starting with commit c793430 (Limit file descriptors used by packs,
2011-02-28), git uses getrlimit to tell how many file descriptors it
can use.  Unfortunately it does not include the header declaring that
function, resulting in compilation errors:

 sha1_file.c: In function 'open_packed_git_1':
 sha1_file.c:718: error: storage size of 'lim' isn't known
 sha1_file.c:721: warning: implicit declaration of function 'getrlimit'
 sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
 sha1_file.c:718: warning: unused variable 'lim'

The standard header to include for this is <sys/resource.h> (which on
some systems itself requires declarations from <sys/types.h> or
<sys/time.h>).  Probably the problem was missed until now because in
current glibc sys/resource.h happens to be included by sys/wait.h.

MinGW does not provide sys/resource.h (and compat/mingw takes care of
providing getrlimit some other way), so add the missing #include to
the "#ifndef __MINGW32__" block in git-compat-util.h.

Reported-by: Stefan Sperling <stsp@stsp.name>
Tested-by: Stefan Sperling <stsp@stsp.name> [on OpenBSD]
Tested-by: Arnaud Lacombe <lacombar@gmail.com> [on FreeBSD 8]
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Oops, should have sent this as its own message before.  Thanks to
doug on irc for a ping.

 git-compat-util.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-compat-util.h b/git-compat-util.h
index bf947b1..79b5122 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -118,6 +118,7 @@
 #endif
 #ifndef __MINGW32__
 #include <sys/wait.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <termios.h>
-- 
1.7.4.2

Re: [PATCH maint resend] compat: add missing #include <sys/resource.h>

[Jonathan Nieder]

Hi Junio,

Jonathan Nieder wrote:

> Date: Fri, 18 Mar 2011 15:23:52 -0500
[...]
>  sha1_file.c:721: error: 'RLIMIT_NOFILE' undeclared (first use in this function)
[...]
> Reported-by: Stefan Sperling <stsp@stsp.name>
> Tested-by: Stefan Sperling <stsp@stsp.name> [on OpenBSD]
> Tested-by: Arnaud Lacombe <lacombar@gmail.com> [on FreeBSD 8]
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Ping?  Would you like a shorter commit message, or was this just lost
in the noise?

Re: [PATCH maint resend] compat: add missing #include <sys/resource.h>

[Junio C Hamano]

Jonathan Nieder <jrnieder@gmail.com> writes:

> Ping?  Would you like a shorter commit message, or was this just lost
> in the noise?

No, it was sitting in my to-be-applied box.  Thanks.