From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: using libmagic in Emacs? Date: Mon, 24 Aug 2009 14:30:33 +0200 Message-ID: References: <83k50xh1m8.fsf@gnu.org> <837hwxgg9w.fsf@gnu.org> <5E0028FD-AF0F-4A63-9218-3DCFFFFF0E0E@raeburn.org> <83zl9pewt0.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1251119055 26091 80.91.229.12 (24 Aug 2009 13:04:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 24 Aug 2009 13:04:15 +0000 (UTC) Cc: raeburn@raeburn.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 24 15:04:06 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MfZDS-00053I-8y for ged-emacs-devel@m.gmane.org; Mon, 24 Aug 2009 15:04:06 +0200 Original-Received: from localhost ([127.0.0.1]:34344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfZDO-0004O3-Ll for ged-emacs-devel@m.gmane.org; Mon, 24 Aug 2009 09:04:02 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MfYhB-0003Yt-3y for emacs-devel@gnu.org; Mon, 24 Aug 2009 08:30:45 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MfYh6-0003VB-2x for emacs-devel@gnu.org; Mon, 24 Aug 2009 08:30:44 -0400 Original-Received: from [199.232.76.173] (port=48344 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MfYh5-0003V7-SP for emacs-devel@gnu.org; Mon, 24 Aug 2009 08:30:39 -0400 Original-Received: from iwfs.imcode.com ([82.115.149.64]:54829 helo=gate.verona.se) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MfYh1-0005MJ-NU; Mon, 24 Aug 2009 08:30:36 -0400 Original-Received: from localhost.localdomain (IDENT:1005@localhost [127.0.0.1]) by gate.verona.se (8.13.4/8.11.4) with ESMTP id n7OCUXU4031654; Mon, 24 Aug 2009 14:30:34 +0200 In-Reply-To: <83zl9pewt0.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 24 Aug 2009 06:05:15 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:114555 Archived-At: --=-=-= Eli Zaretskii writes: >> From: joakim@verona.se >> Date: Mon, 24 Aug 2009 01:38:26 +0200 >> Cc: emacs-devel emacs-devel >> >> + f = SDATA(ENCODE_FILE (absname));//might gc > > No C99 comments, please. This time I compiled with -std=c89. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=filemagic7.patch diff --git a/configure.in b/configure.in index e578f76..90e67e7 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([libmagic],[don't compile with libmagic 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]) @@ -2225,6 +2227,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_libmagic}" != "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) @@ -2959,6 +2974,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 567bff9..ac30bc2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -422,6 +422,7 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE #endif /* not HAVE_LIBRESOLV */ LIBSOUND= @LIBSOUND@ +LIBMAGIC= @LIBMAGIC@ CFLAGS_SOUND= @CFLAGS_SOUND@ RSVG_LIBS= @RSVG_LIBS@ @@ -880,7 +881,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/fileio.c b/src/fileio.c index 3702d4c..568728b 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -205,6 +205,10 @@ Lisp_Object Vdirectory_sep_char; int write_region_inhibit_fsync; #endif +#ifdef HAVE_LIBMAGIC +#include +#endif + /* Non-zero means call move-file-to-trash in Fdelete_file or Fdelete_directory. */ int delete_by_moving_to_trash; @@ -2997,6 +3001,81 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "", #endif /* HAVE_SYNC */ +#ifdef HAVE_LIBMAGIC +DEFUN ("libmagic-file-internal", Flibmagic_file_internal, Slibmagic_file_internal, 1,1,0, + doc: /* Return a list describing the argument FILENAME. + + + The return value is a list of the form + + (MIME-TYPE MIME-ENCODING-NAME DESCRIPTION) + + MIME-TYPE and MIME-ENCODING-NAME are the MIME type and encoding + suitable for the file's contents, as determined by libmagic. + DESCRIPTION is the human readable descripton of the file type + offered by libmagic. + + The function throws a file-error if libmagic cannot determine one of + the elements of the above list. + + The default libmagic database is used, and the quality of + information given depends on your version of that database. Often + the MIME type is less exact than the description. */) + (filename) + Lisp_Object filename; +{ + magic_t cookie=NULL; + char* f = NULL; + const char* returnvaluestr; + Lisp_Object file_description; + Lisp_Object file_mime; + Lisp_Object file_encoding; + Lisp_Object returnvalue; + Lisp_Object absname; + int errsave; + struct gcpro gcpro1; + + CHECK_STRING (filename); + + GCPRO1 (absname); + absname = Fexpand_file_name (filename, current_buffer->directory); /* might gc */ + absname = ENCODE_FILE (absname);/* might gc */ + f = SDATA(absname); + + cookie = magic_open (MAGIC_ERROR); + if (cookie == NULL) goto libmagic_error; + magic_load (cookie, NULL); /* load default database */ + + magic_setflags (cookie, MAGIC_MIME_TYPE | MAGIC_ERROR); + returnvaluestr = magic_file (cookie, f); + if (returnvaluestr == NULL) goto libmagic_error; + file_mime = intern (returnvaluestr); + + magic_setflags (cookie, MAGIC_MIME_ENCODING | MAGIC_ERROR); + returnvaluestr=magic_file (cookie, f); + if (returnvaluestr == NULL) goto libmagic_error; + file_encoding = build_string(returnvaluestr); + + magic_setflags (cookie, MAGIC_NONE | MAGIC_ERROR); + returnvaluestr=magic_file (cookie, f); + if (returnvaluestr == NULL) goto libmagic_error; + + file_description = build_string (returnvaluestr); + returnvalue = Fcons (file_mime, Fcons (file_encoding, Fcons (file_description, Qnil))); /* might gc */ + + magic_close (cookie); + UNGCPRO; + return returnvalue; + libmagic_error: + UNGCPRO; + errsave=errno; + if (cookie != NULL) magic_close (cookie); + errno=errsave; + report_file_error("Libmagic error",Qnil); + return Qnil; +} +#endif + DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0, doc: /* Return t if file FILE1 is newer than file FILE2. If FILE1 does not exist, the answer is nil; @@ -5781,6 +5860,9 @@ When non-nil, the function `move-file-to-trash' will be used by #ifdef HAVE_SYNC defsubr (&Sunix_sync); #endif +#ifdef HAVE_LIBMAGIC + defsubr (&Slibmagic_file_internal); +#endif } /* arch-tag: 64ba3fd7-f844-4fb2-ba4b-427eb928786c --=-=-= -- Joakim Verona --=-=-=--