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
|
diff -Naur dvdbackup-0.4.2/src/dvdbackup.c dvdbackup-0.4.2.new/src/dvdbackup.c
--- dvdbackup-0.4.2/src/dvdbackup.c 2020-04-08 10:56:55.630771977 -0400
+++ dvdbackup-0.4.2.new/src/dvdbackup.c 2020-04-08 11:38:48.851465230 -0400
@@ -1180,7 +1180,7 @@
int size;
/* DVD handler */
- ifo_handle_t* ifo_file = NULL;
+ dvd_file_t* ifo_file = NULL;
if (title_set_info->number_of_title_sets + 1 < title_set) {
@@ -1245,7 +1245,7 @@
if ((streamout_ifo = open(targetname_ifo, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
fprintf(stderr, _("Error creating %s\n"), targetname_ifo);
perror(PACKAGE);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1257,7 +1257,7 @@
if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
fprintf(stderr, _("Error creating %s\n"), targetname_bup);
perror(PACKAGE);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1270,7 +1270,7 @@
if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
fprintf(stderr, _("Failed opening IFO for title set %d\n"), title_set);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1279,11 +1279,11 @@
return 1;
}
- size = DVDFileSize(ifo_file->file) * DVD_VIDEO_LB_LEN;
+ size = DVDFileSize(ifo_file) * DVD_VIDEO_LB_LEN;
if ((buffer = (unsigned char *)malloc(size * sizeof(unsigned char))) == NULL) {
perror(PACKAGE);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1292,11 +1292,11 @@
return 1;
}
- DVDFileSeek(ifo_file->file, 0);
+ DVDFileSeek(ifo_file, 0);
- if (DVDReadBytes(ifo_file->file,buffer,size) != size) {
+ if (DVDReadBytes(ifo_file,buffer,size) != size) {
fprintf(stderr, _("Error reading IFO for title set %d\n"), title_set);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1308,7 +1308,7 @@
if (write(streamout_ifo,buffer,size) != size) {
fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1319,7 +1319,7 @@
if (write(streamout_bup,buffer,size) != size) {
fprintf(stderr, _("Error writing %s\n"),targetname_bup);
- ifoClose(ifo_file);
+ DVDCloseFile(ifo_file);
free(buffer);
free(targetname_ifo);
free(targetname_bup);
@@ -1626,7 +1626,6 @@
title_set_info = DVDGetFileSet(_dvd);
if (!title_set_info) {
- DVDClose(_dvd);
return(1);
}
@@ -1653,7 +1652,6 @@
title_set_info = DVDGetFileSet(_dvd);
if (!title_set_info) {
- DVDClose(_dvd);
return(1);
}
|
