1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
--- common.h 2003-06-13 19:33:35.000000000 +0200
+++ common.h 2005-03-01 07:41:41.000000000 +0100
@@ -27,21 +27,10 @@
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
-#if defined( HAVE_STDINT_H )
-# include <stdint.h>
-#elif defined( HAVE_INTTYPES_H )
-# include <inttypes.h>
-#elif defined( SYS_CYGWIN )
-# include <sys/types.h>
- /* Cygwin only defines half of these... */
- typedef u_int8_t uint8_t;
- typedef u_int32_t uint32_t;
-#else
- /* Fallback types (very x86-centric, sorry) */
- typedef unsigned char uint8_t;
- typedef signed char int8_t;
- typedef unsigned int uint32_t;
- typedef signed int int32_t;
+#include <inttypes.h>
+
+#ifdef __CYGWIN__
+#define SYS_CYGWIN
#endif
#if defined( WIN32 )
--- css.c 2005-07-11 14:24:09.000000000 +0200
+++ css.c 2005-10-01 19:02:35.000000000 +0200
@@ -41,19 +41,11 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#endif
#include <fcntl.h>
-
-#ifdef HAVE_LIMITS_H
# include <limits.h>
-#endif
-#include "dvdcss/dvdcss.h"
+#include "dvdcss.h"
#include "common.h"
#include "css.h"
--- device.c 2005-07-11 13:33:34.000000000 +0200
+++ device.c 2005-10-01 19:08:07.000000000 +0200
@@ -31,23 +31,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_ERRNO_H
# include <errno.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
#include <fcntl.h>
-
-#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
# include <limits.h>
-#endif
#if defined( WIN32 ) && !defined( SYS_CYGWIN )
# include <io.h> /* read() */
@@ -55,7 +44,7 @@
# include <sys/uio.h> /* struct iovec */
#endif
-#include "dvdcss/dvdcss.h"
+#include "dvdcss.h"
#include "common.h"
#include "css.h"
@@ -143,8 +132,11 @@
print_debug( dvdcss, "opening target `%s'", psz_device );
#if defined( WIN32 )
- /* If device is not "X:", we are actually opening a file. */
- dvdcss->b_file = !psz_device[0] || psz_device[1] != ':' || psz_device[2];
+ dvdcss->b_file = 1;
+ /* If device is "X:" or "X:\", we are not actually opening a file. */
+ if (psz_device[0] && psz_device[1] == ':' &&
+ (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3])))
+ dvdcss->b_file = 0;
/* Initialize readv temporary buffer */
dvdcss->p_readv_buffer = NULL;
--- error.c 2004-02-24 16:46:49.000000000 +0100
+++ error.c 2005-10-01 19:10:06.000000000 +0200
@@ -25,16 +25,9 @@
#include <stdio.h>
#include <stdlib.h>
-
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
# include <limits.h>
-#endif
-#include "dvdcss/dvdcss.h"
+#include "dvdcss.h"
#include "common.h"
#include "css.h"
--- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200
+++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200
@@ -87,10 +87,7 @@
* values. This will speed up descrambling of DVDs which are in the
* cache. The DVDCSS_CACHE directory is created if it does not exist,
* and a subdirectory is created named after the DVD's title or
- * manufacturing date. If DVDCSS_CACHE is not set or is empty, \e libdvdcss
- * will use the default value which is "${HOME}/.dvdcss/" under Unix and
- * "C:\Documents and Settings\$USER\Application Data\dvdcss\" under Win32.
- * The special value "off" disables caching.
+ * manufacturing date.
*/
/*
@@ -103,28 +100,12 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-#ifdef HAVE_PWD_H
-# include <pwd.h>
-#endif
#include <fcntl.h>
#include <errno.h>
-
-#ifdef HAVE_UNISTD_H
# include <unistd.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
# include <limits.h>
-#endif
-#ifdef HAVE_DIRECT_H
-# include <direct.h>
-#endif
-
-#include "dvdcss/dvdcss.h"
+#include "dvdcss.h"
#include "common.h"
#include "css.h"
@@ -132,6 +113,12 @@
#include "ioctl.h"
#include "device.h"
+#ifndef HAVE_MPLAYER
+ #include "get_path.c"
+#else
+ extern char * get_path( char * filename );
+#endif
+
/**
* \brief Symbol for version checks.
*
@@ -233,6 +220,8 @@
}
}
+#if 0 /* MPlayer caches keys in its own configuration directory */
+
/*
* If DVDCSS_CACHE was not set, try to guess a default value
*/
@@ -309,6 +298,8 @@
#endif
}
+#endif /* 0 */
+
/*
* Find cache dir from the DVDCSS_CACHE environment variable
*/
@@ -326,6 +317,7 @@
psz_cache = NULL;
}
}
+ else psz_cache = get_path( "DVDKeys" );
/*
* Open device
@@ -504,9 +496,10 @@
dvdcss->psz_cachefile[0] = '\0';
goto nocache;
}
+ i += sprintf( dvdcss->psz_cachefile + i, "/");
- i += sprintf( dvdcss->psz_cachefile + i, "/%s-%s%s", psz_title,
- psz_serial, psz_key );
+// i += sprintf( dvdcss->psz_cachefile + i, "/%s", psz_data );
+ i += sprintf( dvdcss->psz_cachefile + i, "/%s#%s", psz_title, psz_serial );
#if !defined( WIN32 ) || defined( SYS_CYGWIN )
i_ret = mkdir( dvdcss->psz_cachefile, 0755 );
#else
|
