* Fix for iPAQ familiar Linux (untested)

* HTTP files now find the EOF (though HTTP input is still broken)

configure.in

@@ -170,6 +170,7 @@ AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.h)
 AC_CHECK_HEADERS(dlfcn.h image.h)
 AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
 AC_CHECK_HEADERS(machine/param.h sys/shm.h)
+AC_CHECK_HEADERS(scsi/scsi_ioctl.h)
 
 AC_HEADER_TIME
 

include/defs.h.in

-/* include/defs.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* include/defs.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
 #undef C_ALLOCA
@@ -256,6 +256,9 @@
 /* Define if you have the <pthread.h> header file.  */
 #undef HAVE_PTHREAD_H
 
+/* Define if you have the <scsi/scsi_ioctl.h> header file.  */
+#undef HAVE_SCSI_SCSI_IOCTL_H
+
 /* Define if you have the <soundcard.h> header file.  */
 #undef HAVE_SOUNDCARD_H
 

plugins/access/http.c

@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.6 2002/03/26 23:39:43 massiot Exp $
+ * $Id: http.c,v 1.7 2002/04/03 23:24:42 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -151,7 +151,7 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
     /* Prepare the input thread for reading. */ 
     p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
     /* FIXME: we shouldn't have to do that ! */
-    p_input->pf_read = input_FDRead;
+    p_input->pf_read = input_FDNetworkRead;
 
     while( !input_FillBuffer( p_input ) )
     {
@@ -419,7 +419,6 @@ static int HTTPOpen( input_thread_t * p_input )
  *****************************************************************************/
 static void HTTPClose( input_thread_t * p_input )
 {
-    free( p_input->psz_name );
     input_FDClose( p_input );
 }
 

src/interface/intf_eject.c

@@ -2,7 +2,7 @@
  * intf_eject.c: CD/DVD-ROM ejection handling functions
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: intf_eject.c,v 1.5 2002/03/26 23:08:40 gbazin Exp $
+ * $Id: intf_eject.c,v 1.6 2002/04/03 23:24:42 massiot Exp $
  *
  * Author: Julien Blache <jb@technologeek.org> for the Linux part
  *               with code taken from the Linux "eject" command
@@ -61,13 +61,15 @@
 #   include <sys/mount.h>
 #   include <scsi/scsi.h>
 #   include <scsi/sg.h>
+#   ifdef HAVE_SCSI_SCSI_IOCTL_H
 #      include <scsi/scsi_ioctl.h>
+#   endif
 #endif
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX) && defined(HAVE_SCSI_SCSI_IOCTL_H)
 static int EjectSCSI ( int i_fd );
 #endif
 
@@ -138,10 +140,12 @@ int intf_Eject( const char *psz_device )
     /* Try a simple ATAPI eject */
     i_ret = ioctl( i_fd, CDROMEJECT, 0 );
 
+#ifdef HAVE_SCSI_SCSI_IOCTL_H
     if( i_ret != 0 )
     {
         i_ret = EjectSCSI( i_fd );
     }
+#endif
 
     if( i_ret != 0 )
     {
@@ -163,7 +167,7 @@ int intf_Eject( const char *psz_device )
 
 /* The following functions are local */
 
-#ifdef SYS_LINUX
+#if defined(SYS_LINUX) && defined(HAVE_SCSI_SCSI_IOCTL_H)
 /*****************************************************************************
  * Eject using SCSI commands. Return 0 if successful
  *****************************************************************************/