diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-08-27 11:17:03 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-08-27 11:17:03 +0300 |
| commit | 646d09ef9b949d5cb03f9e844d9572823541e179 (patch) | |
| tree | 2efd46c5b58f47a7c020810348189d3060906d8c /build | |
| parent | de9061b214a3b32aeb7ed5bd6374db0674fba578 (diff) | |
| download | rpm-646d09ef9b949d5cb03f9e844d9572823541e179.tar.gz rpm-646d09ef9b949d5cb03f9e844d9572823541e179.tar.bz2 rpm-646d09ef9b949d5cb03f9e844d9572823541e179.zip | |
Use system magic file for file classification.
- use whatever magic_load() uses by default
- remove unused rpm.magic file
Diffstat (limited to 'build')
| -rw-r--r-- | build/rpmfc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build/rpmfc.c b/build/rpmfc.c index 0017af335..42525645a 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -1227,7 +1227,6 @@ int rpmfcClassify(rpmfc fc, ARGV_t argv, int_16 * fmode) int fcolor; int xx; /*@observer@*/ - static const char * magicfile = "/usr/lib/rpm/magic"; int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ magic_t ms = NULL; @@ -1252,11 +1251,10 @@ int rpmfcClassify(rpmfc fc, ARGV_t argv, int_16 * fmode) assert(ms != NULL); /* XXX figger a proper return path. */ } - xx = magic_load(ms, magicfile); + xx = magic_load(ms, NULL); if (xx == -1) { xx = RPMERR_EXEC; - rpmError(xx, _("magic_load(ms, \"%s\") failed: %s\n"), - magicfile, magic_error(ms)); + rpmError(xx, _("magic_load failed: %s\n"), magic_error(ms)); assert(xx != -1); /* XXX figger a proper return path. */ } |