RepoMirrors/simple-mtpfs
1
0
Fork 0
mirror of https://github.com/phatina/simple-mtpfs synced 2024-12-18 04:44:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #71 from JimmyOhn/master

Browse Source 
Thanks, merging...
This commit is contained in:
Peter Hatina 2020-01-06 10:23:03 +01:00 committed by GitHub
commit 9c763c0d59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/simple-mtpfs-fuse.cpp
View File

@ -394,7 +394,10 @@ bool SMTPFileSystem::exec()
} }
m_device.disconnect(); m_device.disconnect();
m_tmp_files_pool.removeTmpDir(); if (!m_tmp_files_pool.removeTmpDir()) {
logerr("Can not remove a temporary directory.\n");
return false;
}
return true; return true;
} }
@ -460,8 +463,12 @@ int SMTPFileSystem::mknod(const char *path, mode_t mode, dev_t dev)
if (rval < 0) if (rval < 0)
return -errno; return -errno;
m_device.filePush(tmp_path, std::string(path)); rval = m_device.filePush(tmp_path, std::string(path));
::unlink(tmp_path.c_str()); ::unlink(tmp_path.c_str());
if (rval != 0)
return rval;
return 0; return 0;
} }
@ -575,7 +582,10 @@ int SMTPFileSystem::create(const char *path, mode_t mode, fuse_file_info *file_i
file_info->fh = rval; file_info->fh = rval;
m_tmp_files_pool.addFile(TypeTmpFile(std::string(path), tmp_path, rval, true)); m_tmp_files_pool.addFile(TypeTmpFile(std::string(path), tmp_path, rval, true));
m_device.filePush(tmp_path, std::string(path)); rval = m_device.filePush(tmp_path, std::string(path));
if (rval != 0)
return rval;
return 0; return 0;
} }

5
src/simple-mtpfs-tmp-files-pool.cpp
View File

@ -58,8 +58,9 @@ std::string TmpFilesPool::makeTmpPath(const std::string &path_device) const
bool TmpFilesPool::createTmpDir() bool TmpFilesPool::createTmpDir()
{ {
removeTmpDir(); if (removeTmpDir())
return smtpfs_create_dir(m_tmp_dir); return smtpfs_create_dir(m_tmp_dir);
return false;
} }
bool TmpFilesPool::removeTmpDir() bool TmpFilesPool::removeTmpDir()