libmpdvdkit2/libdvdcss_changes.diff

   1 --- common.h    2005-10-11 10:55:45.000000000 +0200
   2 +++ common.h    2005-10-11 14:07:42.000000000 +0200
   3 @@ -50,10 +53,9 @@
   4  #   define PATH_MAX MAX_PATH
   5  #endif
   6
   7 -#define lseek _lseeki64
   8 -
   9  /* several type definitions */
  10  #   if defined( __MINGW32__ )
  11 +#define lseek _lseeki64
  12  #       if !defined( _OFF_T_ )
  13  typedef long long _off_t;
  14  typedef _off_t off_t;
  15 --- css.c       2005-07-11 14:24:09.000000000 +0200
  16 +++ css.c       2005-10-01 20:14:37.000000000 +0200
  17 @@ -53,7 +56,7 @@
  18  #   include <limits.h>
  19  #endif
  20
  21 -#include "dvdcss/dvdcss.h"
  22 +#include "dvdcss.h"
  23
  24  #include "common.h"
  25  #include "css.h"
  26 --- device.c    2005-07-11 13:33:34.000000000 +0200
  27 +++ device.c    2005-10-01 19:08:07.000000000 +0200
  28 @@ -55,7 +44,7 @@
  29  #   include <sys/uio.h>                                      /* struct iovec */
  30  #endif
  31
  32 -#include "dvdcss/dvdcss.h"
  33 +#include "dvdcss.h"
  34
  35  #include "common.h"
  36  #include "css.h"
  37 @@ -143,8 +132,11 @@
  38      print_debug( dvdcss, "opening target `%s'", psz_device );
  39
  40  #if defined( WIN32 )
  41 -    /* If device is not "X:", we are actually opening a file. */
  42 -    dvdcss->b_file = !psz_device[0] || psz_device[1] != ':' || psz_device[2];
  43 +    dvdcss->b_file = 1;
  44 +    /* If device is "X:" or "X:\", we are not actually opening a file. */
  45 +    if (psz_device[0] && psz_device[1] == ':' &&
  46 +       (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3])))
  47 +        dvdcss->b_file = 0;
  48
  49      /* Initialize readv temporary buffer */
  50      dvdcss->p_readv_buffer   = NULL;
  51 --- error.c     2004-02-24 16:46:49.000000000 +0100
  52 +++ error.c     2005-10-01 20:15:46.000000000 +0200
  53 @@ -34,7 +37,7 @@
  54  #   include <limits.h>
  55  #endif
  56
  57 -#include "dvdcss/dvdcss.h"
  58 +#include "dvdcss.h"
  59
  60  #include "common.h"
  61  #include "css.h"
  62 --- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200
  63 +++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200
  64 @@ -124,7 +127,7 @@
  65  #   include <direct.h>
  66  #endif
  67
  68 -#include "dvdcss/dvdcss.h"
  69 +#include "dvdcss.h"
  70
  71  #include "common.h"
  72  #include "css.h"