From 2e62e82e18e5f96cd9c6b76e453a016149d96ff1 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Wed, 27 Nov 2013 17:24:43 +0800 Subject: file: remove useless patches no user uses these two patches (From OE-Core rev: 47e7b47def5b06a1d825bf0883409510cb4da36f) Signed-off-by: Roy Li Signed-off-by: Richard Purdie --- meta/recipes-devtools/file/file/ge-le.patch | 72 ----------------------------- 1 file changed, 72 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/ge-le.patch (limited to 'meta/recipes-devtools/file/file/ge-le.patch') diff --git a/meta/recipes-devtools/file/file/ge-le.patch b/meta/recipes-devtools/file/file/ge-le.patch deleted file mode 100644 index fb7d671d6c..0000000000 --- a/meta/recipes-devtools/file/file/ge-le.patch +++ /dev/null @@ -1,72 +0,0 @@ -Upstream-Status: Pending - -`>=' and `<=' was silently ignored in previous version, -but causes an warning in file 5.04. Add support for these -two operators as a feature extension, however, users should -not rely on them. - -8/17/2010 - created by Qing He - -diff --git a/src/apprentice.c b/src/apprentice.c -index 3d4c3cf..a2b86ed 100644 ---- a/src/apprentice.c -+++ b/src/apprentice.c -@@ -1396,11 +1396,10 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, - m->reln = *l; - ++l; - if (*l == '=') { -- if (ms->flags & MAGIC_CHECK) { -- file_magwarn(ms, "%c= not supported", -- m->reln); -- return -1; -- } -+ if (m->reln == '>') -+ m->reln = 'g'; -+ else if (m->reln == '<') -+ m->reln = 'l'; - ++l; - } - break; -diff --git a/src/softmagic.c b/src/softmagic.c -index d8a5675..1648e43 100644 ---- a/src/softmagic.c -+++ b/src/softmagic.c -@@ -1955,6 +1955,38 @@ magiccheck(struct magic_set *ms, struct magic *m) - } - break; - -+ case 'g': -+ if (m->flag & UNSIGNED) { -+ matched = v >= l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%llu >= %llu = %d\n", -+ (unsigned long long)v, -+ (unsigned long long)l, matched); -+ } -+ else { -+ matched = (int64_t) v >= (int64_t) l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%lld >= %lld = %d\n", -+ (long long)v, (long long)l, matched); -+ } -+ break; -+ -+ case 'l': -+ if (m->flag & UNSIGNED) { -+ matched = v <= l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%llu <= %llu = %d\n", -+ (unsigned long long)v, -+ (unsigned long long)l, matched); -+ } -+ else { -+ matched = (int64_t) v <= (int64_t) l; -+ if ((ms->flags & MAGIC_DEBUG) != 0) -+ (void) fprintf(stderr, "%lld <= %lld = %d\n", -+ (long long)v, (long long)l, matched); -+ } -+ break; -+ - case '&': - matched = (v & l) == l; - if ((ms->flags & MAGIC_DEBUG) != 0) -- cgit v1.2.3-54-g00ecf