From: joakim@verona.se
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: Emacs Development <emacs-devel@gnu.org>
Subject: Re: using libmagic in Emacs?
Date: Thu, 20 Aug 2009 00:49:53 +0200 [thread overview]
Message-ID: <m3prarifla.fsf@verona.se> (raw)
In-Reply-To: <jwvk511szbz.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Tue, 18 Aug 2009 15:23:06 -0400")
[-- Attachment #1: Type: text/plain, Size: 834 bytes --]
Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
>
> I think it's a good idea. It may require some non-trivial changes on
> the Lisp side, since libmagic's information is not quite the same as
> what Emacs currently uses: we'll probably want to use libmagic to get
> a MIME-type and then have a table mapping mime-types to major modes or
> some such.
>
>
> Stefan
I attach an early draft filemagic patch.
Some notes:
- The mime type info usualy is less granular than the free
text info:
file --mime /tmp/tst.xcf
/tmp/tst.xcf: application/octet-stream; charset=binary
file /tmp/tst.xcf
/tmp/tst.xcf: GIMP XCF image data, version 0, 640 x 480, RGB Color
This is dependent on the file magic info file used.
- We can probably have much fun debating what the interface should look
like at the lisp level. Any ideas?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: filemagic1.patch --]
[-- Type: text/x-patch, Size: 5605 bytes --]
diff --git a/configure.in b/configure.in
index f4096db..cb74523 100644
--- a/configure.in
+++ b/configure.in
@@ -137,6 +137,8 @@ OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
OPTION_DEFAULT_ON([libotf],[don't use libotf for OpenType font support])
OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
+OPTION_DEFAULT_ON([filemagic],[don't compile with filemagic support])
+
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
@@ -2223,6 +2225,19 @@ if test x"$ac_cv_func_alloca_works" != xyes; then
AC_MSG_ERROR( [a system implementation of alloca is required] )
fi
+
+HAVE_LIBMAGIC=no
+if test "${with_filemagic}" != "no"; then
+ #libmagic support
+ AC_CHECK_HEADERS(magic.h, [ AC_CHECK_LIB(magic,magic_open,HAVE_LIBMAGIC=yes) ])
+fi
+
+if test "${HAVE_LIBMAGIC}" = "yes"; then
+ LIBMAGIC=-lmagic
+ AC_SUBST(LIBMAGIC)
+ AC_DEFINE(HAVE_LIBMAGIC, 1, [Define to 1 if using libmagic.])
+fi
+
# fmod, logb, and frexp are found in -lm on most systems.
# On HPUX 9.01, -lm does not contain logb, so check for sqrt.
AC_CHECK_LIB(m, sqrt)
@@ -2954,6 +2969,7 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use -ldbus? ${HAVE_DBUS}"
+echo " Does Emacs use -lmagic? ${HAVE_LIBMAGIC}"
echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}"
echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}"
diff --git a/src/Makefile.in b/src/Makefile.in
index 425cf98..b80255a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -420,6 +420,7 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
#endif /* not HAVE_LIBRESOLV */
LIBSOUND= @LIBSOUND@
+LIBMAGIC= @LIBMAGIC@
CFLAGS_SOUND= @CFLAGS_SOUND@
RSVG_LIBS= @RSVG_LIBS@
@@ -511,6 +512,12 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o
#endif
#endif
+#ifdef HAVE_LIBMAGIC
+FILEMAGIC_OBJ = filemagic.o
+#else
+FILEMAGIC_OBJ =
+#endif
+
#ifdef CYGWIN
CYGWIN_OBJ = sheap.o
#endif
@@ -551,7 +558,7 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
syntax.o UNEXEC bytecode.o \
process.o callproc.o \
region-cache.o sound.o atimer.o \
- doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
+ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o ${FILEMAGIC_OBJ} \
$(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
/* Object files used on some machine or other.
@@ -878,7 +885,7 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \
duplicated symbols. If the standard libraries were compiled
with GCC, we might need gnulib again after them. */
-LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \
+LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(LIBMAGIC) $(RSVG_LIBS) $(DBUS_LIBS) \
LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
LIBS_DEBUG $(GETLOADAVG_LIBS) \
@FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
diff --git a/src/config.in b/src/config.in
index 404e00b..c966a09 100644
--- a/src/config.in
+++ b/src/config.in
@@ -262,6 +262,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the gpm library (-lgpm). */
#undef HAVE_GPM
+/* Define to 1 if you have the filemagic library (-lmagic). */
+#undef HAVE_LIBMAGIC
+
/* Define to 1 if you have the `grantpt' function. */
#undef HAVE_GRANTPT
diff --git a/src/emacs.c b/src/emacs.c
index 657465d..03d7744 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1683,6 +1683,9 @@ main (int argc, char **argv)
syms_of_window ();
syms_of_xdisp ();
syms_of_font ();
+#ifdef HAVE_LIBMAGIC
+ syms_of_filemagic();
+#endif
#ifdef HAVE_WINDOW_SYSTEM
syms_of_fringe ();
syms_of_image ();
diff --git a/src/filemagic.c b/src/filemagic.c
new file mode 100644
index 0000000..1dcf065
--- /dev/null
+++ b/src/filemagic.c
@@ -0,0 +1,65 @@
+#include <magic.h>
+#include <config.h>
+#include <stdio.h>
+#include <math.h>
+#include <ctype.h>
+
+#include "lisp.h"
+/*
+
+ */
+/*
+ magic_t
+ magic_open(int flags);
+
+ void
+ magic_close(magic_t cookie);
+
+ const char *
+ magic_error(magic_t cookie);
+
+ int
+ magic_errno(magic_t cookie);
+
+ const char *
+ magic_file(magic_t cookie, const char *filename);
+
+ const char *
+ magic_buffer(magic_t cookie, const void *buffer, size_t length);
+
+ int
+ magic_setflags(magic_t cookie, int flags);
+
+ int
+ magic_check(magic_t cookie, const char *filename);
+
+ int
+ magic_compile(magic_t cookie, const char *filename);
+
+ int
+ magic_load(magic_t cookie, const char *filename);
+*/
+
+
+DEFUN ("file-magic-file", Ffile_magic_file, Sfile_magic_file, 1,1,0,
+ doc: /* return libmagic file description for filename */)
+ (filename)
+ Lisp_Object filename;
+{
+ if (!STRINGP (filename)) return Qnil;
+ printf("filename:%s\n",SDATA(filename));
+ magic_t cookie= magic_open(MAGIC_MIME_TYPE);
+ magic_load(cookie,NULL);
+ printf("cookie:%d\n",cookie);
+ char *rvs=magic_file(cookie, SDATA(filename));
+ printf("rvs:%s\n",rvs);
+ Lisp_Object rv=intern(rvs);
+ magic_close(cookie);
+ return rv;
+}
+
+void
+syms_of_filemagic ()
+{
+ defsubr (&Sfile_magic_file);
+}
[-- Attachment #3: Type: text/plain, Size: 20 bytes --]
--
Joakim Verona
next prev parent reply other threads:[~2009-08-19 22:49 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-18 18:35 using libmagic in Emacs? joakim
2009-08-18 19:23 ` Stefan Monnier
2009-08-18 20:01 ` Chong Yidong
2009-08-18 20:35 ` joakim
2009-08-18 21:11 ` Stefan Monnier
2009-08-19 2:58 ` Eli Zaretskii
2009-08-19 3:21 ` Stefan Monnier
2009-08-19 13:47 ` Chong Yidong
2009-08-19 15:57 ` joakim
2009-08-19 19:46 ` next bugfix release? [was: Re: using libmagic in Emacs?] Dan Nicolaescu
2009-08-19 21:06 ` next bugfix release? Chong Yidong
2009-08-19 21:53 ` Dan Nicolaescu
2009-08-19 22:56 ` Alan Mackenzie
2009-08-19 23:16 ` Nick Roberts
2009-08-20 9:02 ` Lennart Borgman
2009-08-20 11:19 ` Eric M. Ludlam
2009-08-20 15:13 ` Alan Mackenzie
2009-08-20 15:47 ` Lennart Borgman
2009-08-19 19:05 ` installing features on trunk (was: using libmagic in Emacs?) Eli Zaretskii
2009-08-21 18:59 ` Bidi support Stefan Monnier
2009-08-21 20:44 ` Eli Zaretskii
2009-08-22 3:39 ` Stefan Monnier
2009-08-22 8:18 ` Jason Rumney
2009-08-22 5:39 ` Stephen J. Turnbull
2009-08-22 7:31 ` Eli Zaretskii
2009-08-24 1:45 ` Kenichi Handa
2009-08-24 3:12 ` Eli Zaretskii
2009-08-24 7:17 ` Kenichi Handa
2009-08-24 3:25 ` Stephen J. Turnbull
2009-08-19 0:57 ` using libmagic in Emacs? Juri Linkov
2009-08-20 3:42 ` Richard Stallman
2009-08-22 23:36 ` Juri Linkov
2009-08-24 0:07 ` Richard Stallman
2009-08-24 0:17 ` Juri Linkov
2009-08-24 7:33 ` joakim
2009-08-25 2:08 ` Richard Stallman
2009-08-25 2:19 ` Miles Bader
2009-08-25 5:09 ` joakim
2009-08-25 13:27 ` James Cloos
2009-08-25 21:41 ` Thien-Thi Nguyen
2009-08-25 17:36 ` Stefan Monnier
2009-08-25 20:37 ` Juri Linkov
2009-08-29 23:19 ` Juri Linkov
2009-08-30 3:09 ` Eli Zaretskii
2009-08-30 20:54 ` Juri Linkov
2009-08-31 2:49 ` Eli Zaretskii
2009-08-31 16:17 ` Juri Linkov
2009-08-31 17:58 ` Eli Zaretskii
2009-09-01 12:16 ` Richard Stallman
2009-09-01 16:12 ` Stefan Monnier
2009-09-01 21:20 ` Richard Stallman
2009-09-03 19:42 ` Stefan Monnier
2009-09-04 7:52 ` Richard Stallman
2009-08-31 22:21 ` Richard Stallman
2009-08-31 3:33 ` Richard Stallman
2009-08-31 15:03 ` Chong Yidong
2009-08-31 16:19 ` Juri Linkov
2009-08-31 23:47 ` Stefan Monnier
2009-09-01 3:16 ` Eli Zaretskii
2009-09-01 5:37 ` Stefan Monnier
2009-09-01 12:16 ` Richard Stallman
2009-08-25 20:36 ` Juri Linkov
2009-08-19 22:49 ` joakim [this message]
2009-08-19 23:20 ` Dan Nicolaescu
2009-08-20 1:03 ` Stephen J. Turnbull
2009-08-20 3:12 ` Eli Zaretskii
2009-08-20 4:50 ` Stephen J. Turnbull
2009-08-20 18:20 ` Eli Zaretskii
2009-08-21 0:19 ` Stephen J. Turnbull
2009-08-20 18:32 ` Richard Stallman
2009-08-21 19:10 ` Stefan Monnier
2009-08-22 5:03 ` Stephen J. Turnbull
2009-08-23 1:03 ` Stefan Monnier
2009-08-20 13:57 ` Stefan Monnier
2009-08-20 19:19 ` joakim
2009-08-20 22:08 ` Andreas Schwab
2009-08-21 9:55 ` joakim
2009-08-21 11:01 ` Eli Zaretskii
2009-08-21 17:38 ` joakim
2009-08-21 17:46 ` Rupert Swarbrick
2009-08-21 18:31 ` Andreas Schwab
2009-08-21 19:13 ` Drew Adams
2009-08-21 18:42 ` Eli Zaretskii
2009-08-21 21:48 ` joakim
2009-08-21 22:46 ` Andreas Schwab
2009-08-22 20:18 ` joakim
2009-08-22 23:13 ` Ken Raeburn
2009-08-23 23:38 ` joakim
2009-08-24 3:05 ` Eli Zaretskii
2009-08-24 12:30 ` joakim
2009-08-23 3:24 ` Eli Zaretskii
2009-08-21 19:18 ` Stefan Monnier
2009-08-21 13:19 ` Andreas Schwab
2009-08-20 18:32 ` Richard Stallman
2009-08-20 20:27 ` Reiner Steib
2009-08-21 14:08 ` Richard Stallman
2009-08-21 19:16 ` Stefan Monnier
2009-08-28 0:27 ` Language identification (was: using libmagic in Emacs) Juri Linkov
2009-08-28 4:58 ` Language identification Stefan Monnier
2009-08-28 9:00 ` Stephen J. Turnbull
2009-08-28 14:56 ` Stefan Monnier
2009-08-29 4:11 ` Stephen J. Turnbull
2009-08-29 14:21 ` Chong Yidong
2009-08-29 0:46 ` Richard Stallman
2009-08-29 4:13 ` Stephen J. Turnbull
2009-08-29 15:28 ` Stefan Monnier
2009-08-29 16:27 ` Stephen J. Turnbull
2009-08-28 19:16 ` Juri Linkov
2009-08-29 1:12 ` Stefan Monnier
2009-08-30 16:01 ` Richard Stallman
2009-08-29 20:20 ` Richard Stallman
2009-08-29 22:48 ` Juri Linkov
2009-08-31 3:32 ` Richard Stallman
2009-08-31 8:42 ` David Kastrup
2009-08-31 8:59 ` Jan D.
2009-08-31 3:33 ` Richard Stallman
2009-08-28 6:45 ` Alex Ott
2009-08-28 6:46 ` Alex Ott
2009-08-28 19:08 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3prarifla.fsf@verona.se \
--to=joakim@verona.se \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.