Drop buildid_write_return.patch; no longer needed.

Signed-off-by: 's avatarMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
parent 04acbb3e
......@@ -23,8 +23,6 @@ shim (13-0ubuntu1) UNRELEASED; urgency=medium
* debian/rules: clean up after *.signed files.
* debian/shim.install: update paths in light of using shim's upstream install
target.
* debian/patches/buildid_write_return.patch: workaround our strict compile
rules failing the build: make sure write calls check the return value.
* debian/rules, debian/shim.install: make sure the 'make install' step does
what it's meant to do by upstream: we can easily make use of the end result
to have the files we need.
......
---
buildid.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
Index: b/buildid.c
===================================================================
--- a/buildid.c
+++ b/buildid.c
@@ -113,6 +113,7 @@ static void handle_one(char *f)
char *b = NULL;
size_t sz;
uint8_t *data;
+ ssize_t written;
if (!strcmp(f, "-")) {
fd = STDIN_FILENO;
@@ -132,10 +133,14 @@ static void handle_one(char *f)
b = alloca(sz * 2 + 1);
data2hex(data, sz, b);
if (b) {
- write(1, f, strlen(f));
- write(1, " ", 1);
- write(1, b, strlen(b));
- write(1, "\n", 1);
+ written = write(1, f, strlen(f));
+ if (written < 0)
+ errx(1, "Error writing build id");
+ written = write(1, " ", 1);
+ written = write(1, b, strlen(b));
+ if (written < 0)
+ errx(1, "Error writing build id");
+ written = write(1, "\n", 1);
}
}
elf_end(elf);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment