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
|
https://bugs.launchpad.net/pbzip2/+bug/1524909
https://bugs.gentoo.org/567952
=== modified file 'pbzip2.cpp'
--- pbzip2.cpp 2014-12-21 10:20:27 +0000
+++ pbzip2.cpp 2015-12-11 00:14:31 +0000
@@ -2083,6 +2083,17 @@
return 0;
}
+void close_streams(FILE *stream, FILE *zStream)
+{
+ if (stream != NULL)
+ fflush(stream);
+
+ if (zStream != NULL && zStream != stdin)
+ fclose(zStream);
+ if (stream != NULL && stream != stdout)
+ fclose(stream);
+}
+
/*
*********************************************************
*/
@@ -2125,9 +2136,7 @@
// check file stream for errors
if (ferror(zStream))
{
- if (zStream != stdin)
- fclose(zStream);
-
+ close_streams(stream, zStream);
handle_error(EF_EXIT, -1,
"pbzip2: *ERROR: Problem with input stream of file [%s]! Aborting...\n", InFilename);
return -1;
@@ -2155,9 +2164,7 @@
// check file stream for errors
if (ferror(stream))
{
- if (stream != stdout)
- fclose(stream);
-
+ close_streams(stream, zStream);
handle_error(EF_EXIT, -1,
"pbzip2: *ERROR: Problem with output stream of file [%s]! Aborting...\n", InFilename);
return -1;
@@ -2169,10 +2176,7 @@
if (syncGetTerminateFlag() != 0)
{
fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n");
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
+ close_streams(stream, zStream);
return -1;
}
@@ -2180,11 +2184,8 @@
if (bzf == NULL || bzerr != BZ_OK)
{
ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
-
+ close_streams(stream, zStream);
+
if (ret != 0)
{
syncSetTerminateFlag(1);
@@ -2200,10 +2201,7 @@
if (syncGetTerminateFlag() != 0)
{
fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n");
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
+ close_streams(stream, zStream);
return -1;
}
@@ -2225,11 +2223,8 @@
if (ferror(zStream))
{
ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
-
+ close_streams(stream, zStream);
+
if (ret != 0)
{
syncSetTerminateFlag(1);
@@ -2242,11 +2237,8 @@
if (ferror(stream))
{
ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
-
+ close_streams(stream, zStream);
+
if (ret != 0)
{
syncSetTerminateFlag(1);
@@ -2263,11 +2255,8 @@
if (ferror(stream))
{
ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
-
+ close_streams(stream, zStream);
+
if (ret != 0)
{
syncSetTerminateFlag(1);
@@ -2278,11 +2267,8 @@
if (bzerr != BZ_STREAM_END)
{
ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
- if (zStream != stdin)
- fclose(zStream);
- if (stream != stdout)
- fclose(stream);
-
+ close_streams(stream, zStream);
+
if (ret != 0)
{
syncSetTerminateFlag(1);
|
GitWeb