Update upstream source from tag 'upstream/1.3.0+dfsg.1'

[libgit2.git] / src / filebuf.h

diff --git a/src/filebuf.h b/src/filebuf.h
index dcaad9bd8a2954235289fb9cd3035463435323c2..9d53bc3076fa2f4c84ba119e0d8d5776d3b31727 100644 (file)
--- a/src/filebuf.h
+++ b/src/filebuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012 the libgit2 contributors
+ * Copyright (C) the libgit2 contributors. All rights reserved.
  *
  * This file is part of libgit2, distributed under the GNU GPL v2 with
  * a Linking Exception. For full terms see the included COPYING file.
@@ -7,7 +7,9 @@
 #ifndef INCLUDE_filebuf_h__
 #define INCLUDE_filebuf_h__
 
-#include "fileops.h"
+#include "common.h"
+
+#include "futils.h"
 #include "hash.h"
 #include <zlib.h>
 
@@ -17,19 +19,21 @@
 
 #define GIT_FILEBUF_HASH_CONTENTS              (1 << 0)
 #define GIT_FILEBUF_APPEND                             (1 << 2)
-#define GIT_FILEBUF_FORCE                              (1 << 3)
+#define GIT_FILEBUF_CREATE_LEADING_DIRS        (1 << 3)
 #define GIT_FILEBUF_TEMPORARY                  (1 << 4)
 #define GIT_FILEBUF_DO_NOT_BUFFER              (1 << 5)
-#define GIT_FILEBUF_DEFLATE_SHIFT              (6)
+#define GIT_FILEBUF_FSYNC                              (1 << 6)
+#define GIT_FILEBUF_DEFLATE_SHIFT              (7)
 
 #define GIT_FILELOCK_EXTENSION ".lock\0"
 #define GIT_FILELOCK_EXTLENGTH 6
 
+typedef struct git_filebuf git_filebuf;
 struct git_filebuf {
        char *path_original;
        char *path_lock;
 
-       int (*write)(struct git_filebuf *file, void *source, size_t len);
+       int (*write)(git_filebuf *file, void *source, size_t len);
 
        bool compute_digest;
        git_hash_ctx digest;
@@ -43,12 +47,13 @@ struct git_filebuf {
        size_t buf_size, buf_pos;
        git_file fd;
        bool fd_is_open;
+       bool created_lock;
+       bool did_rename;
        bool do_not_buffer;
+       bool do_fsync;
        int last_error;
 };
 
-typedef struct git_filebuf git_filebuf;
-
 #define GIT_FILEBUF_INIT {0}
 
 /*
@@ -77,9 +82,10 @@ int git_filebuf_write(git_filebuf *lock, const void *buff, size_t len);
 int git_filebuf_reserve(git_filebuf *file, void **buff, size_t len);
 int git_filebuf_printf(git_filebuf *file, const char *format, ...) GIT_FORMAT_PRINTF(2, 3);
 
-int git_filebuf_open(git_filebuf *lock, const char *path, int flags);
-int git_filebuf_commit(git_filebuf *lock, mode_t mode);
-int git_filebuf_commit_at(git_filebuf *lock, const char *path, mode_t mode);
+int git_filebuf_open(git_filebuf *lock, const char *path, int flags, mode_t mode);
+int git_filebuf_open_withsize(git_filebuf *file, const char *path, int flags, mode_t mode, size_t size);
+int git_filebuf_commit(git_filebuf *lock);
+int git_filebuf_commit_at(git_filebuf *lock, const char *path);
 void git_filebuf_cleanup(git_filebuf *lock);
 int git_filebuf_hash(git_oid *oid, git_filebuf *file);
 int git_filebuf_flush(git_filebuf *file);