annotate remap.c @ 438:04cb2d6e4f93 src tip

In vm_new_vm(), use the proper calloc() argument order .. and don't derive 1 from the unrelated sizeof(char). Fixes the scan-anaylzer "API violation" warning: Result of 'calloc' is converted to a pointer of type 'vm_t', which is incompatible with sizeof operand type 'char' Patch by Fabian Keil <fk AT fabiankeil DOT de>
author rathann
date Wed, 04 Dec 2013 23:02:01 +0000
parents 00c5edf5de12
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
1 /*
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
2 * This file is part of libdvdnav, a DVD navigation library.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
3 *
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
4 * libdvdnav is free software; you can redistribute it and/or modify
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
5 * it under the terms of the GNU General Public License as published by
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
7 * (at your option) any later version.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
8 *
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
9 * libdvdnav is distributed in the hope that it will be useful,
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
12 * GNU General Public License for more details.
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
13 *
389
d3c273ced49c Use consistent license headers everywhere: Fix wrong FSF address.
diego
parents: 388
diff changeset
14 * You should have received a copy of the GNU General Public License along
d3c273ced49c Use consistent license headers everywhere: Fix wrong FSF address.
diego
parents: 388
diff changeset
15 * with libdvdnav; if not, write to the Free Software Foundation, Inc.,
d3c273ced49c Use consistent license headers everywhere: Fix wrong FSF address.
diego
parents: 388
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
17 */
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
18
287
f22a52d426a3 include config.h (if present)
nicodvb
parents: 286
diff changeset
19 #ifdef HAVE_CONFIG_H
f22a52d426a3 include config.h (if present)
nicodvb
parents: 286
diff changeset
20 #include "config.h"
f22a52d426a3 include config.h (if present)
nicodvb
parents: 286
diff changeset
21 #endif
f22a52d426a3 include config.h (if present)
nicodvb
parents: 286
diff changeset
22
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
23 #include <stdlib.h>
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
24 #include <string.h>
423
00c5edf5de12 Add missing strings.h #include for strncasecmp().
diego
parents: 416
diff changeset
25 #include <strings.h>
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
26 #include <stdio.h>
176
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
27
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
28 #ifndef _MSC_VER
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
29 #include <sys/param.h>
416
4e34a2fce645 Do not use non-standard sys/fcntl.h include, use just fcntl.h
reimar
parents: 395
diff changeset
30 #include <fcntl.h>
176
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
31 #else
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
32 #ifndef MAXPATHLEN
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
33 #define MAXPATHLEN 255
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
34 #endif
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
35 #endif /* _MSC_VER */
4e099155c968 Helping with the WIN32 port.
jcdutton
parents: 114
diff changeset
36
286
6fac6a613ea5 moved inclusion of inttypes.h from dvd_types.h to the including .c files
nicodvb
parents: 285
diff changeset
37 #include <inttypes.h>
294
2146ff691bcd include limits.h; it was included in the previous dvdnav_internal.h and without it players segfault
nicodvb
parents: 290
diff changeset
38 #include <limits.h>
290
54b6a000f6da decoder.h needs inclusion of sys/time.h
nicodvb
parents: 287
diff changeset
39 #include <sys/time.h>
395
9c5aef10d165 Move dvd_types.h, dvdnav_events.h and dvdnav.h into a dvdnav directory.
reimar
parents: 392
diff changeset
40 #include "dvdnav/dvdnav.h"
386
579a3538d284 Sync with current libdvdread header location.
rathann
parents: 378
diff changeset
41 #include <dvdread/nav_types.h>
579a3538d284 Sync with current libdvdread header location.
rathann
parents: 378
diff changeset
42 #include <dvdread/ifo_types.h>
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
43 #include "remap.h"
285
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 282
diff changeset
44 #include "vm/decoder.h"
52877d182e96 moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess
nicodvb
parents: 282
diff changeset
45 #include "vm/vm.h"
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
46 #include "dvdnav_internal.h"
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
47
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
48 struct block_s {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
49 int domain;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
50 int title;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
51 int program;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
52 unsigned long start_block;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
53 unsigned long end_block;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
54 };
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
55
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
56 struct remap_s {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
57 char *title;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
58 int maxblocks;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
59 int nblocks;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
60 int debug;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
61 struct block_s *blocks;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
62 };
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
63
212
6b67914ae021 port Daniel's changes to xine-lib cvs to minimize difference
mroi
parents: 176
diff changeset
64 static remap_t* remap_new( char *title) {
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
65 remap_t *map = malloc( sizeof(remap_t));
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
66 map->title = strdup(title);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
67 map->maxblocks = 0;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
68 map->nblocks = 0;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
69 map->blocks = NULL;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
70 map->debug = 0;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
71 return map;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
72 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
73
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
74 static int compare_block( block_t *a, block_t *b) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
75 /* returns -1 if a precedes b, 1 if a follows b, and 0 if a and b overlap */
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
76 if (a->domain < b->domain) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
77 return -1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
78 } else if (a->domain > b->domain) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
79 return 1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
80 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
81
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
82 if (a->title < b->title) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
83 return -1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
84 } else if (a->title > b->title) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
85 return 1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
86 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
87
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
88 if (a->program < b->program) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
89 return -1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
90 } else if (a->program > b->program) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
91 return 1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
92 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
93
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
94 if (a->end_block < b->start_block) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
95 return -1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
96 } else if (a->start_block > b->end_block) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
97 /*
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
98 * if a->start_block == b->end_block then the two regions
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
99 * aren't strictly overlapping, but they should be merged
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
100 * anyway since there are zero blocks between them
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
101 */
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
102 return 1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
103 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
104
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
105 return 0;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
106 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
107
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
108 static block_t *findblock( remap_t *map, block_t *key) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
109 int lb = 0;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
110 int ub = map->nblocks - 1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
111 int mid;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
112 int res;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
113
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
114 while (lb <= ub) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
115 mid = lb + (ub - lb)/2;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
116 res = compare_block( key, &map->blocks[mid]);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
117 if (res < 0) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
118 ub = mid-1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
119 } else if (res > 0) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
120 lb = mid+1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
121 } else {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
122 return &map->blocks[mid];
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
123 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
124 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
125 return NULL;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
126 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
127
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
128 static void mergeblock( block_t *b, block_t tmp) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
129 if (tmp.start_block < b->start_block) b->start_block = tmp.start_block;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
130 if (tmp.end_block > b->end_block) b->end_block = tmp.end_block;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
131 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
132
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
133 static void remap_add_node( remap_t *map, block_t block) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
134 block_t *b;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
135 int n;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
136 b = findblock( map, &block);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
137 if (b) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
138 /* overlaps an existing block */
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
139 mergeblock( b, block);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
140 } else {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
141 /* new block */
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
142 if (map->nblocks >= map->maxblocks) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
143 map->maxblocks += 20;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
144 map->blocks = realloc( map->blocks, sizeof( block_t)*map->maxblocks);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
145 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
146 n = map->nblocks++;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
147 while (n > 0 && compare_block( &block, &map->blocks[ n-1]) < 0) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
148 map->blocks[ n] = map->blocks[ n-1];
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
149 n--;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
150 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
151 map->blocks[ n] = block;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
152 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
153 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
154
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
155 static int parseblock(char *buf, int *dom, int *tt, int *pg,
212
6b67914ae021 port Daniel's changes to xine-lib cvs to minimize difference
mroi
parents: 176
diff changeset
156 unsigned long *start, unsigned long *end) {
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
157 long tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
158 char *tok;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
159 char *epos;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
160 char *marker[]={"domain", "title", "program", "start", "end"};
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
161 int st = 0;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
162 tok = strtok( buf, " ");
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
163 while (st < 5) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
164 if (strcmp(tok, marker[st])) return -st-1000;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
165 tok = strtok( NULL, " ");
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
166 if (!tok) return -st-2000;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
167 tmp = strtol( tok, &epos, 0);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
168 if (*epos != 0 && *epos != ',') return -st-3000;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
169 switch (st) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
170 case 0:
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
171 *dom = (int)tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
172 break;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
173 case 1:
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
174 *tt = (int)tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
175 break;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
176 case 2:
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
177 *pg = (int)tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
178 break;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
179 case 3:
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
180 *start = tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
181 break;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
182 case 4:
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
183 *end = tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
184 break;
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
185 }
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
186 st++;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
187 tok = strtok( NULL, " ");
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
188 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
189 return st;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
190 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
191
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
192 remap_t* remap_loadmap( char *title) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
193 char buf[160];
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
194 char fname[MAXPATHLEN];
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
195 char *home;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
196 int res;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
197 FILE *fp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
198 block_t tmp;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
199 remap_t *map;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
200
375
5820649e5aa2 in remap_loadmap() memzero tmp before using it; patch by Erik Hovland org
nicodvb
parents: 371
diff changeset
201 memset(&tmp, 0, sizeof(tmp));
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
202 /* Build the map filename */
371
587353009f65 replace an assert(getenv("HOME)) with a return NULL in cases
nicodvb
parents: 342
diff changeset
203 home = getenv("HOME");
587353009f65 replace an assert(getenv("HOME)) with a return NULL in cases
nicodvb
parents: 342
diff changeset
204 if(!home) {
587353009f65 replace an assert(getenv("HOME)) with a return NULL in cases
nicodvb
parents: 342
diff changeset
205 fprintf(MSG_OUT, "libdvdnav: Unable to find home directory" );
587353009f65 replace an assert(getenv("HOME)) with a return NULL in cases
nicodvb
parents: 342
diff changeset
206 return NULL;
587353009f65 replace an assert(getenv("HOME)) with a return NULL in cases
nicodvb
parents: 342
diff changeset
207 }
282
918fe20358cb replaced sequency of strncpy() and strncat() by 1 snprintf() and fixed off-by-1 possible buffer oveflow; patch by Diego Petteno'
nicodvb
parents: 212
diff changeset
208 snprintf(fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title);
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
209
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
210 /* Open the map file */
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
211 fp = fopen( fname, "r");
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
212 if (!fp) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
213 fprintf(MSG_OUT, "libdvdnav: Unable to find map file '%s'\n", fname);
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
214 return NULL;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
215 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
216
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
217 /* Load the map file */
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
218 map = remap_new( title);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
219 while (fgets( buf, sizeof(buf), fp) != NULL) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
220 if (buf[0] == '\n' || buf[0] == '#' || buf[0] == 0) continue;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
221 if (strncasecmp( buf, "debug", 5) == 0) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
222 map->debug = 1;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
223 } else {
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
224 res = parseblock( buf,
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
225 &tmp.domain, &tmp.title, &tmp.program, &tmp.start_block, &tmp.end_block);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
226 if (res != 5) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
227 fprintf(MSG_OUT, "libdvdnav: Ignoring map line (%d): %s\n", res, buf);
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
228 continue;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
229 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
230 remap_add_node( map, tmp);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
231 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
232 }
342
83758bfacd4c in remap_loadmap() close the file pointer before exiting ; patch by Erik Hovland - erik hovland org
nicodvb
parents: 341
diff changeset
233 fclose(fp);
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
234
341
090b808c421b in remap_loadmap() free map before exiting in case of failure ; patch by Erik Hovland - erik hovland org
nicodvb
parents: 332
diff changeset
235 if (map->nblocks == 0 && map->debug == 0) {
090b808c421b in remap_loadmap() free map before exiting in case of failure ; patch by Erik Hovland - erik hovland org
nicodvb
parents: 332
diff changeset
236 free(map);
090b808c421b in remap_loadmap() free map before exiting in case of failure ; patch by Erik Hovland - erik hovland org
nicodvb
parents: 332
diff changeset
237 return NULL;
090b808c421b in remap_loadmap() free map before exiting in case of failure ; patch by Erik Hovland - erik hovland org
nicodvb
parents: 332
diff changeset
238 }
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
239 return map;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
240 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
241
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
242 unsigned long remap_block(
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
243 remap_t *map, int domain, int title, int program,
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
244 unsigned long cblock, unsigned long offset)
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
245 {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
246 block_t key;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
247 block_t *b;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
248
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
249 if (map->debug) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
250 fprintf(MSG_OUT, "libdvdnav: %s: domain %d, title %d, program %d, start %lx, next %lx\n",
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
251 map->title, domain, title, program, cblock, cblock+offset);
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
252 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
253
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
254 key.domain = domain;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
255 key.title = title;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
256 key.program = program;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
257 key.start_block = key.end_block = cblock + offset;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
258 b = findblock( map, &key);
388
90ca650854e0 Remove all trailing whitespace,
rathann
parents: 386
diff changeset
259
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
260 if (b) {
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
261 if (map->debug) {
114
b6834e6359cf big libdvdnav cleanup, quoting the ChangeLog:
mroi
parents: 96
diff changeset
262 fprintf(MSG_OUT, "libdvdnav: Redirected to %lx\n", b->end_block);
96
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
263 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
264 return b->end_block - cblock;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
265 }
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
266 return offset;
2fcb4f228308 Adding "Personalizing DVD Viewing" files from <kevin_smathers@hp.com>
jcdutton
parents:
diff changeset
267 }