mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 05:03:03 +01:00
9deb373671
This patch includes the update of patch upstream status of the following recipes (50 in all): grub pciutils setserial dhcp iproute2 libnss-mdns nfs-utils openssl portmap busybox coreutils dbus dropbear ncurses readline sysfsutils sysvinit tinylogin udev update-rc.d util-linux elfutils file pkgconfig syslinux ubootchart yaffs2 findutils gamin hdparm libaio libzypp parted procps sat-solver screen sed sysklogd tcp-wrapper time zypper attr boost createrepo gnutls hal js libgcrypt libnl libusb-compat (From OE-Core rev: 1e6f767663b7d5fb6277fd2b214f4a50e24d4ffd) Signed-off-by: Qing He <qing.he@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
970 B
Diff
32 lines
970 B
Diff
Upstream-Status: Pending
|
|
|
|
`B' in file 4.x has the same meaning with `W' in file 5,
|
|
let `B' be an alias of `W'.
|
|
|
|
8/17/2010 - created by Qing He <qing.he@intel.com>
|
|
|
|
diff --git a/src/apprentice.c b/src/apprentice.c
|
|
index 58826c3..3d4c3cf 100644
|
|
--- a/src/apprentice.c
|
|
+++ b/src/apprentice.c
|
|
@@ -1340,6 +1340,7 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
|
|
"zero range");
|
|
l = t - 1;
|
|
break;
|
|
+ case CHAR_COMPACT_BLANK:
|
|
case CHAR_COMPACT_WHITESPACE:
|
|
m->str_flags |= STRING_COMPACT_WHITESPACE;
|
|
break;
|
|
diff --git a/src/file.h b/src/file.h
|
|
index c07f2d4..42cf416 100644
|
|
--- a/src/file.h
|
|
+++ b/src/file.h
|
|
@@ -282,6 +282,7 @@ struct magic {
|
|
#define STRING_TEXTTEST BIT(5)
|
|
#define STRING_BINTEST BIT(6)
|
|
#define CHAR_COMPACT_WHITESPACE 'W'
|
|
+#define CHAR_COMPACT_BLANK 'B'
|
|
#define CHAR_COMPACT_OPTIONAL_WHITESPACE 'w'
|
|
#define CHAR_IGNORE_LOWERCASE 'c'
|
|
#define CHAR_IGNORE_UPPERCASE 'C'
|