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
|
From db62a534ebcf60391d9e0acffa641e60dfba18fb Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 19 Sep 2018 10:36:36 +0200
Subject: [PATCH] getmntent fix
---
sbuild/sbuild-mntstream.cc | 15 ++-------------
sbuild/sbuild-mntstream.h | 3 +--
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git sbuild/sbuild-mntstream.cc sbuild/sbuild-mntstream.cc
index d376fe5..d7324e7 100644
--- a/sbuild/sbuild-mntstream.cc
+++ b/sbuild/sbuild-mntstream.cc
@@ -37,9 +37,7 @@ namespace
emap init_errors[] =
{
// TRANSLATORS: %1% = mount file name
- emap(mntstream::MNT_OPEN, N_("Failed to open mount file ‘%1%’")),
- // TRANSLATORS: %1% = mount file name
- emap(mntstream::MNT_READ, N_("Failed to read mount file ‘%1%’"))
+ emap(mntstream::MNT_OPEN, N_("Failed to open mount file ‘%1%’"))
};
}
@@ -109,16 +107,7 @@ mntstream::read(int quantity)
errno = 0;
entry = getmntent(mntfile);
- if (entry == 0) // EOF or error
- {
- //std::cerr << "Mount file read error: ";
- if (errno) // error
- {
- this->error_status = true;
- throw error(this->file, MNT_READ, strerror(errno));
- }
- return;
- }
+ if (entry == 0) return;
mntentry newentry(*entry); // make a mntentry
this->data.push_back(newentry); // push onto the end of the list
diff --git sbuild/sbuild-mntstream.h sbuild/sbuild-mntstream.h
index ea3d179..fffcdf4 100644
--- a/sbuild/sbuild-mntstream.h
+++ b/sbuild/sbuild-mntstream.h
@@ -49,8 +49,7 @@ namespace sbuild
/// Error codes.
enum error_code
{
- MNT_OPEN, ///< Failed to open mount file.
- MNT_READ ///< Failed to read mount file.
+ MNT_OPEN ///< Failed to open mount file.
};
/// Exception type.
--
2.19.0
|
