Still Failing: g-i-installation_debian_sid_daily_hurd_lxde/438
See https://jenkins.debian.net/job/g-i-installation_debian_sid_daily_hurd_lxde/438/ and https://jenkins.debian.net/job/g-i-installation_debian_sid_daily_hurd_lxde/438//console and https://jenkins.debian.net/job/g-i-installation_debian_sid_daily_hurd_lxde/438//artifact/results/ if there are any.
Re: [PATCH 6/7] grep: Skip grepping symlinks to directories
Applied, thanks
On Sat, Oct 7, 2017 at 7:53 PM, James Clarke wrote:
> When grep is passed -r, recursive_action will treat any symlinks to
> directories not in the root as normal files, since it lstat's them and
> is therefore told they are not directories. However, file_action_grep
> will still try to fopen and read from them to see whether they match,
> which varies in behaviour across platforms. Linux will give EISDIR and
> thus grep will not find any matching lines, but FreeBSD will give the
> raw contents of the directory itself, which may match the given pattern.
> Also, if grep is passed -c, it will even print a count for these
> symlinks, even on Linux.
>
> Since this recursive_action behaviour is required for the correct
> functioning of other applets, such as tar, grep should handle this
> special case and skip any such symlinks.
>
> Signed-off-by: James Clarke
> ---
> findutils/grep.c | 22 --
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/findutils/grep.c b/findutils/grep.c
> index f72175afb..0cb0aac64 100644
> --- a/findutils/grep.c
> +++ b/findutils/grep.c
> @@ -639,11 +639,29 @@ static void load_regexes_from_file(llist_t *fopt)
> }
>
> static int FAST_FUNC file_action_grep(const char *filename,
> - struct stat *statbuf UNUSED_PARAM,
> + struct stat *statbuf,
> void* matched,
> int depth UNUSED_PARAM)
> {
> - FILE *file = fopen_for_read(filename);
> + FILE *file;
> + struct stat statbufFollow;
> +
> + /* If we are given a link to a directory, we should bail out now,
> rather
> +* than trying to open the "file" and hoping getline gives us nothing,
> +* since that is not portable across operating systems (FreeBSD for
> example
> +* will return the raw directory contents). */
> + if (S_ISLNK(statbuf->st_mode)) {
> + if (stat(filename, &statbufFollow) < 0) {
> + if (!SUPPRESS_ERR_MSGS)
> + bb_simple_perror_msg(filename);
> + return 0;
> + }
> +
> + if (S_ISDIR(statbufFollow.st_mode))
> + return 1;
> + }
> +
> + file = fopen_for_read(filename);
> if (file == NULL) {
> if (!SUPPRESS_ERR_MSGS)
> bb_simple_perror_msg(filename);
> --
> 2.14.1
>
> ___
> busybox mailing list
> busy...@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
Re: [PATCH 7/7] libbb.h: Handle missing HOST_NAME_MAX; ensure MAXFOOLEN agrees with FOO_MAX
How about this?
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -709,6 +709,9 @@ packet_ok(int read_len, len_and_sockaddr *from_lsa,
# if ENABLE_FEATURE_TRACEROUTE_VERBOSE
if (verbose) {
+# ifndef MAXHOSTNAMELEN
+# define MAXHOSTNAMELEN 80
+# endif
unsigned char *p;
char pa1[MAXHOSTNAMELEN];
char pa2[MAXHOSTNAMELEN];
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
index 1141b78..1328c1f 100644
--- a/util-linux/fdisk_osf.c
+++ b/util-linux/fdisk_osf.c
@@ -709,6 +709,9 @@ sync_disks(void)
static void
xbsd_write_bootstrap(void)
{
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
char path[MAXPATHLEN];
const char *bootdir = BSD_LINUX_BOOTDIR;
const char *dkbasename;
Re: [PATCH 7/7] libbb.h: Handle missing HOST_NAME_MAX; ensure MAXFOOLEN agrees with FOO_MAX
On 31 Oct 2017, at 15:06, Denys Vlasenko wrote:
>
> How about this?
>
> --- a/networking/traceroute.c
> +++ b/networking/traceroute.c
> @@ -709,6 +709,9 @@ packet_ok(int read_len, len_and_sockaddr *from_lsa,
>
> # if ENABLE_FEATURE_TRACEROUTE_VERBOSE
>if (verbose) {
> +# ifndef MAXHOSTNAMELEN
> +# define MAXHOSTNAMELEN 80
> +# endif
80 is definitely not the right fallback value to use. As mentioned by Kang-Che
earlier in the thread, 255 is the POSIX defined minimum[0] for HOST_NAME_MAX.
In fact, it should really be using INET6_ADDRSTRLEN here since it's just being
used as the destination for inet_ntop with AF_INET6, and this has to be defined
in , though the spec says it must be 46 so we could just use that
as a fallback if it isn't even defined.[1]
>unsigned char *p;
>char pa1[MAXHOSTNAMELEN];
>char pa2[MAXHOSTNAMELEN];
> diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c
> index 1141b78..1328c1f 100644
> --- a/util-linux/fdisk_osf.c
> +++ b/util-linux/fdisk_osf.c
> @@ -709,6 +709,9 @@ sync_disks(void)
> static void
> xbsd_write_bootstrap(void)
> {
> +#ifndef MAXPATHLEN
> +# define MAXPATHLEN 1024
> +#endif
This is linux-specific, which has MAXPATHLEN, so there's no point doing this.
>char path[MAXPATHLEN];
>const char *bootdir = BSD_LINUX_BOOTDIR;
>const char *dkbasename;
Regards,
James
[0] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html
[1] http://pubs.opengroup.org/onlinepubs/95399/basedefs/netinet/in.h.html
Processing of gnumach_1.8+git20171101-1_hurd-i386.changes
gnumach_1.8+git20171101-1_hurd-i386.changes uploaded successfully to localhost along with the files: gnumach_1.8+git20171101-1.dsc gnumach_1.8+git20171101.orig.tar.bz2 gnumach_1.8+git20171101-1.debian.tar.bz2 gnumach-common_1.8+git20171101-1_all.deb gnumach-dbg_1.8+git20171101-1_hurd-i386.deb gnumach-dev_1.8+git20171101-1_hurd-i386.deb gnumach-image-1-486_1.8+git20171101-1_hurd-i386.deb gnumach-image-1-xen-486_1.8+git20171101-1_hurd-i386.deb gnumach-image-1.8-486-dbg_1.8+git20171101-1_hurd-i386.deb gnumach-image-1.8-486_1.8+git20171101-1_hurd-i386.deb gnumach-image-1.8-xen-486-dbg_1.8+git20171101-1_hurd-i386.deb gnumach-image-1.8-xen-486_1.8+git20171101-1_hurd-i386.deb gnumach_1.8+git20171101-1_hurd-i386.buildinfo gnumach_1.8+git20171101-1_hurd-i386.deb kernel-image-1.8-486-di_1.8+git20171101-1_hurd-i386.udeb kernel-image-1.8-xen-486-di_1.8+git20171101-1_hurd-i386.udeb Greetings, Your Debian queue daemon (running on host usper.debian.org)
gnumach_1.8+git20171101-1_hurd-i386.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 01 Nov 2017 00:34:33 + Source: gnumach Binary: gnumach gnumach-dbg gnumach-image-1-486 gnumach-image-1-xen-486 gnumach-image-1.8-486 gnumach-image-1.8-xen-486 kernel-image-1.8-486-di kernel-image-1.8-xen-486-di gnumach-image-1.8-486-dbg gnumach-image-1.8-xen-486-dbg gnumach-common gnumach-dev Architecture: source all hurd-i386 Version: 2:1.8+git20171101-1 Distribution: unstable Urgency: medium Maintainer: GNU Hurd Maintainers Changed-By: Samuel Thibault Description: gnumach- Dummy transition package for gnumach-image-* gnumach-common - GNU version of the Mach microkernel, common files. gnumach-dbg - Dummy transition package for gnumach-image-*-dbg gnumach-dev - GNU version of the Mach microkernel gnumach-image-1-486 - GNU version of the Mach microkernel gnumach-image-1-xen-486 - GNU version of the Mach microkernel gnumach-image-1.8-486 - GNU version of the Mach microkernel gnumach-image-1.8-486-dbg - GNU version of the Mach microkernel for debugging gnumach-image-1.8-xen-486 - GNU version of the Mach microkernel for Xen gnumach-image-1.8-xen-486-dbg - GNU version of the Mach microkernel for Xen for debugging kernel-image-1.8-486-di - GNU version of the Mach microkernel for the Debian installer (udeb) kernel-image-1.8-xen-486-di - GNU version of the Mach microkernel for the Debian installer (udeb) Changes: gnumach (2:1.8+git20171101-1) unstable; urgency=medium . * New upstream snapshot. * control: Remove old gnumach and gnumach-dbg transitional packages. * rules: Fix again building mach.info... Checksums-Sha1: 49b59721be19ed8e8524d0a85221dc36dea68292 3051 gnumach_1.8+git20171101-1.dsc 700633edd4babb2b0f02aac806928f79cf5fa32d 3232623 gnumach_1.8+git20171101.orig.tar.bz2 5aeac901d26dbc6021aab446f2356dd1b6a594ba 30522 gnumach_1.8+git20171101-1.debian.tar.bz2 14ff8f68b8c0d9dabc6b6b704e5199b888e85a21 273160 gnumach-common_1.8+git20171101-1_all.deb 008e0af390d68a7b1080864002afb2e3d9075fd0 177228 gnumach-dbg_1.8+git20171101-1_hurd-i386.deb 638be4f05a924419e2c586ff520ad14c6f1af507 243412 gnumach-dev_1.8+git20171101-1_hurd-i386.deb 746e993626163c58b58b5156d17b5b9d299dab65 177192 gnumach-image-1-486_1.8+git20171101-1_hurd-i386.deb d245be39ce975ed1f33a3e27e165eecf785dee53 177244 gnumach-image-1-xen-486_1.8+git20171101-1_hurd-i386.deb 2d7b2a3cb64f0490940459df260c4e55214a42fc 2994272 gnumach-image-1.8-486-dbg_1.8+git20171101-1_hurd-i386.deb 3f65e1d3a70694d9d2c2226bbf8e6b0bb30510fe 763536 gnumach-image-1.8-486_1.8+git20171101-1_hurd-i386.deb cda1705a9d38c5413a15cbb37446c6bf83a61393 1640208 gnumach-image-1.8-xen-486-dbg_1.8+git20171101-1_hurd-i386.deb 94d96f196082cf79cb05a2eac26613e7c2283846 410540 gnumach-image-1.8-xen-486_1.8+git20171101-1_hurd-i386.deb 8fcf93b884b1a11da89576c28ca727fab6c82a33 9912 gnumach_1.8+git20171101-1_hurd-i386.buildinfo dab00aef53b37656fc3937b763555102d1551978 177460 gnumach_1.8+git20171101-1_hurd-i386.deb b6867ddad87f0175539400c001ba0aa4b368cbd0 581652 kernel-image-1.8-486-di_1.8+git20171101-1_hurd-i386.udeb d8d2333b2437965b12270b1279bc648c0db14227 228908 kernel-image-1.8-xen-486-di_1.8+git20171101-1_hurd-i386.udeb Checksums-Sha256: c058fb7eedde0db9764f830a28da9cdaa641a4ef6653583c9626c9d9d22144b0 3051 gnumach_1.8+git20171101-1.dsc 76a67a7a5975febfa6f9b773a537ef671f6af18c1b08e1797432cdda18fb1eee 3232623 gnumach_1.8+git20171101.orig.tar.bz2 7785029a43f4bb9577e9e9520d49a6ad768b576661b36340449c19f57ffc025f 30522 gnumach_1.8+git20171101-1.debian.tar.bz2 3e44f14e3c4128151d8708e301c29aa2103729bc80baebf69196b1e4f5af5585 273160 gnumach-common_1.8+git20171101-1_all.deb 226d4bd4fea7a9679703a3d73b7f31ba50e05860fac4346a730ad43b377f4f97 177228 gnumach-dbg_1.8+git20171101-1_hurd-i386.deb dc96c39530f2362da281ec06c60613eda674f2e11b94d66023d0c4973ed167be 243412 gnumach-dev_1.8+git20171101-1_hurd-i386.deb d1096246896b438ed73e2f384205b607c17a7c8ffa8d2948e031e2fcd03b 177192 gnumach-image-1-486_1.8+git20171101-1_hurd-i386.deb 1610f12dc3fabeb10a50e8dad616922c5d4b97c458fdf422931f7618a537ad7d 177244 gnumach-image-1-xen-486_1.8+git20171101-1_hurd-i386.deb a8247a90bc156ef217df2b25d57d6366e74b049fdec9381d5c108699f2b2857e 2994272 gnumach-image-1.8-486-dbg_1.8+git20171101-1_hurd-i386.deb 4fec8b92f32e7425fd2ec9470b8034093c8e4d4bd15246bdfb89d30f4a9ebc7f 763536 gnumach-image-1.8-486_1.8+git20171101-1_hurd-i386.deb 74e5ddbbaa686656ed985fa5ca0989c8cdbf1cdd6bce1df54934e20ec1cf1b7e 1640208 gnumach-image-1.8-xen-486-dbg_1.8+git20171101-1_hurd-i386.deb e85cc6cfebc5885ac060c3fc466d39671f9471cd08455a21e42703a9539fbc72 410540 gnumach-image-1.8-xen-486_1.8+git20171101-1_hurd-i386.deb edb0923dc1d4bb5b94cb72104dcadb609a69d0d7a3116e0c7710811e8ceffecb 9912 gnumach_1.8+git20171101-1_hurd-i386.buildinfo 119fa57098bdbd4432dabd4420b46ce054ebe536a7cc58e60d5070f5ddf63916 177460 gnumach_1.8+git20171101-1_hurd-i386.deb 488b33edb297eb257e9a8fc3bbc30b61b362fa523b73a0
