sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

file: remove useless patches 

no user uses these two patches

(From OE-Core rev: 47e7b47def5b06a1d825bf0883409510cb4da36f)

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Roy Li 2013-11-27 17:24:43 +08:00 committed by Richard Purdie
parent 5bfd3779fd
commit 2e62e82e18
2 changed files with 0 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
meta/recipes-devtools/file/file/ge-le.patch
View File

@ -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 <qing.he@intel.com>
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)

31
meta/recipes-devtools/file/file/stringb-compat.patch
View File

@ -1,31 +0,0 @@
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'