From 682fb48c137b687477008b68863c2a0b73ed47d1 Mon Sep 17 00:00:00 2001
|
From: Fabio Berton <fabio.berton@ossystems.com.br>
|
Date: Fri, 9 Sep 2016 16:00:42 -0300
|
Subject: [PATCH] handle read-only files
|
|
Patch from:
|
https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d26348a503509
|
|
Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89]
|
|
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
|
|
---
|
src/patchelf.cc | 16 +++++++++++++++-
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
diff --git a/src/patchelf.cc b/src/patchelf.cc
|
index fd1e7b7..a941da1 100644
|
--- a/src/patchelf.cc
|
+++ b/src/patchelf.cc
|
@@ -527,9 +527,19 @@ void ElfFile<ElfFileParamNames>::sortShdrs()
|
|
static void writeFile(const std::string & fileName, const FileContents & contents)
|
{
|
+ struct stat st;
|
+ int fd;
|
+
|
debug("writing %s\n", fileName.c_str());
|
|
- int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777);
|
+ if (stat(fileName.c_str(), &st) != 0)
|
+ error("stat");
|
+
|
+ if (chmod(fileName.c_str(), 0600) != 0)
|
+ error("chmod");
|
+
|
+ fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777);
|
+
|
if (fd == -1)
|
error("open");
|
|
@@ -543,6 +553,10 @@ static void writeFile(const std::string & fileName, const FileContents & content
|
|
if (close(fd) != 0)
|
error("close");
|
+
|
+ if (chmod(fileName.c_str(), st.st_mode) != 0)
|
+ error("chmod");
|
+
|
}
|
|
|