Open directories O_RDONLY for fsync, add debugging if it fails

This commit is contained in:
Matt Johnston 2015-01-04 22:22:43 +08:00
parent 4ba830fc31
commit 634415f79e
2 changed files with 9 additions and 4 deletions

View File

@ -41,7 +41,9 @@ static int buf_writefile(buffer * buf, const char * filename) {
out: out:
if (fd >= 0) { if (fd >= 0) {
fsync(fd); if (fsync(fd) != 0) {
dropbear_log(LOG_ERR, "fsync of %s failed: %s", filename, strerror(errno));
}
m_close(fd); m_close(fd);
} }
return ret; return ret;

View File

@ -91,12 +91,15 @@ static void fsync_parent_dir(const char* fn) {
#ifdef HAVE_LIBGEN_H #ifdef HAVE_LIBGEN_H
char *fn_dir = m_strdup(fn); char *fn_dir = m_strdup(fn);
char *dir = dirname(fn_dir); char *dir = dirname(fn_dir);
/* some OSes need the fd to be writable for fsync */ int dirfd = open(dir, O_RDONLY);
int dirfd = open(dir, O_RDWR);
if (dirfd != -1) { if (dirfd != -1) {
fsync(dirfd); if (fsync(dirfd) != 0) {
TRACE(("fsync of directory %s failed: %s", dir, strerror(errno)))
}
m_close(dirfd); m_close(dirfd);
} else {
TRACE(("error opening directory %s for fsync: %s", dir, strerror(errno)))
} }
free(fn_dir); free(fn_dir);