Skip to content

Commit

Permalink
added patches from fedora
Browse files Browse the repository at this point in the history
  • Loading branch information
peps1 committed Nov 10, 2016
1 parent 520781a commit 5340930
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
7 changes: 6 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Nov 09, 2016
Add PRET support
bump to 0.9.3; requires libcurl >=7.20.0
danoe
pepsi

Apr 29, 2008
Reduce DEFAULT_CACHE_TIMEOUT from 300 to 10 seconds. List cache options and
default timeout in --help.
mail2nob

Apr 29, 2008
release curlftpfs 0.9.2
Expand Down
16 changes: 8 additions & 8 deletions ftpfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,6 @@ static int create_empty_file(const char * path)
pthread_mutex_lock(&ftpfs.lock);
cancel_previous_multi();
curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_URL, full_path);
curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_INFILESIZE, 0);
curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_UPLOAD, 1);
curl_easy_setopt_or_die(ftpfs.connection, CURLOPT_READDATA, NULL);
CURLcode curl_res = curl_easy_perform(ftpfs.connection);
Expand Down Expand Up @@ -763,13 +762,13 @@ static int ftpfs_open_common(const char* path, mode_t mode,
err = -ENOTSUP;
}

if ((fi->flags & O_EXCL))
{
DEBUG(1, "opening %s with O_EXCL - testing existence\n", path);
int exists_r = test_exists(path);
if (exists_r != -ENOENT)
err = -EACCES;
}
//if ((fi->flags & O_EXCL))
//{
//DEBUG(1, "opening %s with O_EXCL - testing existence\n", path);
//int exists_r = test_exists(path);
//if (exists_r != -ENOENT)
// err = -EACCES;
//}

if (!err)
{
Expand Down Expand Up @@ -820,6 +819,7 @@ static int ftpfs_open(const char* path, struct fuse_file_info* fi) {
#if FUSE_VERSION >= 25
static int ftpfs_create(const char* path, mode_t mode,
struct fuse_file_info* fi) {
ftpfs_mknod(path, mode, NULL);
return ftpfs_open_common(path, mode, fi);
}
#endif
Expand Down

0 comments on commit 5340930

Please sign in to comment.