GNU bug report logs - #5827
[PATCH] tail: include sys/vfs.h

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 5827 in the body.
You can then email your comments to 5827 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Marc Kleine-Budde <mkl <at> pengutronix.de>
To: bug-coreutils <at> gnu.org
Cc: Marc Kleine-Budde <mkl <at> pengutronix.de>
Subject: [PATCH] tail: include sys/vfs.h
Date: Sat,  3 Apr 2010 15:52:18 +0200

Hello,

the latest coreutils release 8.4 and current git master fail during the
(cross-) compilation of tail. The used components are:

gcc-4.3.2
glibc-2.8
binutils-2.18

The following patch fixes the commit. It's against git master, but should
apply on 8.4, too.

Please review and consider inclusion.

Cheers, Marc


From ebf1ab5bcba6f6b82bb8f0a62c949858e2a9d5cc Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl <at> pengutronix.de>
Date: Sat, 3 Apr 2010 14:42:29 +0200
Subject: [PATCH] tail: include sys/vfs.h

This patch fixes the following error:

tail.c: In function 'fremote':
tail.c:882: error: storage size of 'buf' isn't known
tail.c:883: warning: implicit declaration of function 'fstatfs'

Signed-off-by: Marc Kleine-Budde <mkl <at> pengutronix.de>
---
 src/tail.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/tail.c b/src/tail.c
index 02c4a1a..d0bc957 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -57,6 +57,9 @@
 # if HAVE_SYS_STATFS_H
 #  include <sys/statfs.h>
 # endif
+# if HAVE_SYS_VFS_H
+#  include <sys/vfs.h>
+# endif
 #endif
 
 /* The official name of this program (e.g., no `g' prefix).  */
-- 
1.7.0.3

Message #8 received at 5827 <at> debbugs.gnu.org (full text, mbox):

From: Jim Meyering <jim <at> meyering.net>
To: Marc Kleine-Budde <mkl <at> pengutronix.de>
Cc: 5827 <at> debbugs.gnu.org
Subject: Re: bug#5827: [PATCH] tail: include sys/vfs.h
Date: Sun, 04 Apr 2010 09:16:10 +0200

Marc Kleine-Budde wrote:
> the latest coreutils release 8.4 and current git master fail during the
> (cross-) compilation of tail. The used components are:
>
> gcc-4.3.2
> glibc-2.8
> binutils-2.18
>
> The following patch fixes the commit. It's against git master, but should
> apply on 8.4, too.
...
>  # if HAVE_SYS_STATFS_H
>  #  include <sys/statfs.h>
>  # endif
> +# if HAVE_SYS_VFS_H
> +#  include <sys/vfs.h>
> +# endif
>  #endif

I'd like to take a slightly more conservative approach,
including sys/vfs.h only when sys/statfs.h is not available.
Does this work for you?

From 98dacf492e2e6f2153455cb4179058578cee20ff Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl <at> pengutronix.de>
Date: Sun, 4 Apr 2010 09:15:07 +0200
Subject: [PATCH] tail: include sys/vfs.h (if possible) when sys/statfs.h is absent

* src/tail.c [HAVE_INOTIFY && !HAVE_SYS_STATFS_H]: Include <sys/vfs.h>.
---
 src/tail.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/tail.c b/src/tail.c
index 02c4a1a..9e95dee 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -56,6 +56,8 @@
 # include "fs.h"
 # if HAVE_SYS_STATFS_H
 #  include <sys/statfs.h>
+# elif HAVE_SYS_VFS_H
+#  include <sys/vfs.h>
 # endif
 #endif

--
1.7.0.4.529.g78fb

Message #11 received at 5827 <at> debbugs.gnu.org (full text, mbox):

From: Marc Kleine-Budde <mkl <at> pengutronix.de>
To: Jim Meyering <jim <at> meyering.net>
Cc: 5827 <at> debbugs.gnu.org
Subject: Re: bug#5827: [PATCH] tail: include sys/vfs.h
Date: Sun, 04 Apr 2010 11:48:45 +0200

[Message part 1 (text/plain, inline)]

Hey Jim,

Jim Meyering wrote:
> Marc Kleine-Budde wrote:
>> the latest coreutils release 8.4 and current git master fail during the
>> (cross-) compilation of tail. The used components are:
>>
>> gcc-4.3.2
>> glibc-2.8
>> binutils-2.18
>>
>> The following patch fixes the commit. It's against git master, but should
>> apply on 8.4, too.
> ...
>>  # if HAVE_SYS_STATFS_H
>>  #  include <sys/statfs.h>
>>  # endif
>> +# if HAVE_SYS_VFS_H
>> +#  include <sys/vfs.h>
>> +# endif
>>  #endif
> 
> I'd like to take a slightly more conservative approach,
> including sys/vfs.h only when sys/statfs.h is not available.
> Does this work for you?

Thanks, works, even with older gcc/glibc combinations.

>>From 98dacf492e2e6f2153455cb4179058578cee20ff Mon Sep 17 00:00:00 2001
> From: Marc Kleine-Budde <mkl <at> pengutronix.de>
> Date: Sun, 4 Apr 2010 09:15:07 +0200
> Subject: [PATCH] tail: include sys/vfs.h (if possible) when sys/statfs.h is absent
> 
> * src/tail.c [HAVE_INOTIFY && !HAVE_SYS_STATFS_H]: Include <sys/vfs.h>.

Tested-by: Marc Kleine-Budde <mkl <at> pengutronix.de>

> ---
>  src/tail.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/src/tail.c b/src/tail.c
> index 02c4a1a..9e95dee 100644
> --- a/src/tail.c
> +++ b/src/tail.c
> @@ -56,6 +56,8 @@
>  # include "fs.h"
>  # if HAVE_SYS_STATFS_H
>  #  include <sys/statfs.h>
> +# elif HAVE_SYS_VFS_H
> +#  include <sys/vfs.h>
>  # endif
>  #endif
> 
> --
> 1.7.0.4.529.g78fb

cheers, Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

[signature.asc (application/pgp-signature, attachment)]

Message #16 received at 5827-done <at> debbugs.gnu.org (full text, mbox):

From: Jim Meyering <jim <at> meyering.net>
To: Marc Kleine-Budde <mkl <at> pengutronix.de>
Cc: 5827-done <at> debbugs.gnu.org
Subject: Re: bug#5827: [PATCH] tail: include sys/vfs.h
Date: Mon, 05 Apr 2010 11:43:35 +0200

Marc Kleine-Budde wrote:
...
>> I'd like to take a slightly more conservative approach,
>> including sys/vfs.h only when sys/statfs.h is not available.
>> Does this work for you?
>
> Thanks, works, even with older gcc/glibc combinations.

Thanks.
Pushed, along with a gnulib update.

Message #17 received at 5827-done <at> debbugs.gnu.org (full text, mbox):

From: Marc Kleine-Budde <mkl <at> pengutronix.de>
To: Jim Meyering <jim <at> meyering.net>
Cc: 5827-done <at> debbugs.gnu.org
Subject: Re: bug#5827: [PATCH] tail: include sys/vfs.h
Date: Mon, 05 Apr 2010 12:10:40 +0200

[Message part 1 (text/plain, inline)]

Jim Meyering wrote:
> Marc Kleine-Budde wrote:
> ...
>>> I'd like to take a slightly more conservative approach,
>>> including sys/vfs.h only when sys/statfs.h is not available.
>>> Does this work for you?
>> Thanks, works, even with older gcc/glibc combinations.
> 
> Thanks.
> Pushed, along with a gnulib update.

\o/

I have to thank you for the quick bugfix.

cheers, Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

[signature.asc (application/pgp-signature, attachment)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.