X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fgnunet_disk_lib.h;h=be28854600c1f6c27deaff9ba55118d643b67415;hb=3f52ce03cb13118bef9a6fbe380f229e2cbec45f;hp=692507641a8fbae923f8d895451e80c12cf8dc35;hpb=5dc5c7268ba88e70e208dc5c0a43b19bf111aeb3;p=oweals%2Fgnunet.git diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index 692507641..be2885460 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h @@ -1,10 +1,10 @@ /* This file is part of GNUnet. - (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2001-2012 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your + by the Free Software Foundation; either version 3, or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but @@ -14,26 +14,83 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ - /** - * @file include/gnunet_disk_lib.h - * @brief disk IO apis + * @author Christian Grothoff + * + * @file + * Disk IO APIs + * + * @defgroup disk Disk library + * Disk IO APIs + * @{ */ #ifndef GNUNET_DISK_LIB_H #define GNUNET_DISK_LIB_H /** - * Opaque handle used to access files. + * Handle used to manage a pipe. */ -struct GNUNET_DISK_FileHandle; +struct GNUNET_DISK_PipeHandle; /** - * Opaque handle used to manage a pipe. + * Type of a handle. */ -struct GNUNET_DISK_PipeHandle; +enum GNUNET_FILE_Type +{ + /** + * Handle represents an event. + */ + GNUNET_DISK_HANLDE_TYPE_EVENT, + + /** + * Handle represents a file. + */ + GNUNET_DISK_HANLDE_TYPE_FILE, + + /** + * Handle represents a pipe. + */ + GNUNET_DISK_HANLDE_TYPE_PIPE +}; + +/** + * Handle used to access files (and pipes). + */ +struct GNUNET_DISK_FileHandle +{ + +#if WINDOWS + /** + * File handle under W32. + */ + HANDLE h; + + /** + * Type + */ + enum GNUNET_FILE_Type type; + + /** + * Structure for overlapped reading (for pipes) + */ + OVERLAPPED *oOverlapRead; + + /** + * Structure for overlapped writing (for pipes) + */ + OVERLAPPED *oOverlapWrite; +#else + + /** + * File handle on other OSes. + */ + int fd; + +#endif +}; /* we need size_t, and since it can be both unsigned int @@ -53,68 +110,198 @@ extern "C" #endif -/* Open the file for reading */ -#define GNUNET_DISK_OPEN_READ 1 -/* Open the file for writing */ -#define GNUNET_DISK_OPEN_WRITE 2 -/* Open the file for both reading and writing */ -#define GNUNET_DISK_OPEN_READWRITE 3 -/* Fail if file already exists */ -#define GNUNET_DISK_OPEN_FAILIFEXISTS 4 -/* Truncate file if it exists */ -#define GNUNET_DISK_OPEN_TRUNCATE 8 -/* Create file if it doesn't exist */ -#define GNUNET_DISK_OPEN_CREATE 16 -/* Append to the file */ -#define GNUNET_DISK_OPEN_APPEND 32 +/** + * Specifies how a file should be opened. + */ +enum GNUNET_DISK_OpenFlags +{ -#define GNUNET_DISK_MAP_READ 1 -#define GNUNET_DISK_MAP_WRITE 2 -#define GNUNET_DISK_MAP_READWRITE 3 + /** + * Open the file for reading + */ + GNUNET_DISK_OPEN_READ = 1, -#define GNUNET_DISK_PERM_USER_READ 1 -#define GNUNET_DISK_PERM_USER_WRITE 2 -#define GNUNET_DISK_PERM_USER_EXEC 4 -#define GNUNET_DISK_PERM_GROUP_READ 8 -#define GNUNET_DISK_PERM_GROUP_WRITE 16 -#define GNUNET_DISK_PERM_GROUP_EXEC 32 -#define GNUNET_DISK_PERM_OTHER_READ 64 -#define GNUNET_DISK_PERM_OTHER_WRITE 128 -#define GNUNET_DISK_PERM_OTHER_EXEC 256 + /** + * Open the file for writing + */ + GNUNET_DISK_OPEN_WRITE = 2, -enum GNUNET_DISK_Seek - { - GNUNET_DISK_SEEK_SET, - GNUNET_DISK_SEEK_CUR, - GNUNET_DISK_SEEK_END - }; + /** + * Open the file for both reading and writing + */ + GNUNET_DISK_OPEN_READWRITE = 3, + + /** + * Fail if file already exists + */ + GNUNET_DISK_OPEN_FAILIFEXISTS = 4, + + /** + * Truncate file if it exists + */ + GNUNET_DISK_OPEN_TRUNCATE = 8, + + /** + * Create file if it doesn't exist + */ + GNUNET_DISK_OPEN_CREATE = 16, + + /** + * Append to the file + */ + GNUNET_DISK_OPEN_APPEND = 32 +}; /** - * Get the number of blocks that are left on the partition that - * contains the given file (for normal users). - * - * @param part a file on the partition to check - * @return -1 on errors, otherwise the number of free blocks + * Specifies what type of memory map is desired. */ -long GNUNET_DISK_get_blocks_available (const char *part); +enum GNUNET_DISK_MapType +{ + /** + * Read-only memory map. + */ + GNUNET_DISK_MAP_TYPE_READ = 1, + + /** + * Write-able memory map. + */ + GNUNET_DISK_MAP_TYPE_WRITE = 2, + + /** + * Read-write memory map. + */ + GNUNET_DISK_MAP_TYPE_READWRITE = 3 +}; + + +/** + * File access permissions, UNIX-style. + */ +enum GNUNET_DISK_AccessPermissions +{ + /** + * Nobody is allowed to do anything to the file. + */ + GNUNET_DISK_PERM_NONE = 0, + + /** + * Owner can read. + */ + GNUNET_DISK_PERM_USER_READ = 1, + + /** + * Owner can write. + */ + GNUNET_DISK_PERM_USER_WRITE = 2, + + /** + * Owner can execute. + */ + GNUNET_DISK_PERM_USER_EXEC = 4, + + /** + * Group can read. + */ + GNUNET_DISK_PERM_GROUP_READ = 8, + + /** + * Group can write. + */ + GNUNET_DISK_PERM_GROUP_WRITE = 16, + + /** + * Group can execute. + */ + GNUNET_DISK_PERM_GROUP_EXEC = 32, + + /** + * Everybody can read. + */ + GNUNET_DISK_PERM_OTHER_READ = 64, + + /** + * Everybody can write. + */ + GNUNET_DISK_PERM_OTHER_WRITE = 128, + + /** + * Everybody can execute. + */ + GNUNET_DISK_PERM_OTHER_EXEC = 256 +}; + + +/** + * Constants for specifying how to seek. Do not change values or order, + * some of the code depends on the specific numeric values! + */ +enum GNUNET_DISK_Seek +{ + /** + * Seek an absolute position (from the start of the file). + */ + GNUNET_DISK_SEEK_SET = 0, + + /** + * Seek a relative position (from the current offset). + */ + GNUNET_DISK_SEEK_CUR = 1, + + /** + * Seek an absolute position from the end of the file. + */ + GNUNET_DISK_SEEK_END = 2 +}; + + +/** + * Enumeration identifying the two ends of a pipe. + */ +enum GNUNET_DISK_PipeEnd +{ + /** + * The reading-end of a pipe. + */ + GNUNET_DISK_PIPE_END_READ = 0, + + /** + * The writing-end of a pipe. + */ + GNUNET_DISK_PIPE_END_WRITE = 1 +}; /** * Checks whether a handle is invalid + * * @param h handle to check - * @return GNUNET_YES if invalid, GNUNET_NO if valid + * @return #GNUNET_YES if invalid, #GNUNET_NO if valid */ -int GNUNET_DISK_handle_invalid (const struct GNUNET_DISK_FileHandle *h); +int +GNUNET_DISK_handle_invalid (const struct GNUNET_DISK_FileHandle *h); /** * Check that fil corresponds to a filename * (of a file that exists and that is not a directory). * - * @returns GNUNET_YES if yes, GNUNET_NO if not a file, GNUNET_SYSERR if something + * @param fil filename to check + * @return #GNUNET_YES if yes, #GNUNET_NO if not a file, #GNUNET_SYSERR if something * else (will print an error message in that case, too). */ -int GNUNET_DISK_file_test (const char *fil); +int +GNUNET_DISK_file_test (const char *fil); + + +/** + * Move a file out of the way (create a backup) by + * renaming it to "orig.NUM~" where NUM is the smallest + * number that is not used yet. + * + * @param fil name of the file to back up + */ +void +GNUNET_DISK_file_backup (const char *fil); /** @@ -125,208 +312,361 @@ int GNUNET_DISK_file_test (const char *fil); * @return the new position on success, GNUNET_SYSERR otherwise */ off_t -GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, - off_t offset, - enum GNUNET_DISK_Seek whence); +GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, off_t offset, + enum GNUNET_DISK_Seek whence); /** - * Get the size of the file (or directory) - * of the given file (in bytes). + * Get the size of the file (or directory) of the given file (in + * bytes). * * @param filename name of the file or directory * @param size set to the size of the file (or, * in the case of directories, the sum * of all sizes of files in the directory) - * @param includeSymLinks should symbolic links be + * @param include_symbolic_links should symbolic links be * included? + * @param single_file_mode #GNUNET_YES to only get size of one file + * and return #GNUNET_SYSERR for directories. + * @return #GNUNET_SYSERR on error, #GNUNET_OK on success + */ +int +GNUNET_DISK_file_size (const char *filename, + uint64_t *size, + int include_symbolic_links, + int single_file_mode); + + +/** + * Obtain some unique identifiers for the given file + * that can be used to identify it in the local system. + * This function is used between GNUnet processes to + * quickly check if two files with the same absolute path + * are actually identical. The two processes represent + * the same peer but may communicate over the network + * (and the file may be on an NFS volume). This function + * may not be supported on all operating systems. * - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @param filename name of the file + * @param dev set to the device ID + * @param ino set to the inode ID + * @return #GNUNET_OK on success */ -int GNUNET_DISK_file_size (const char *filename, - uint64_t *size, - int includeSymLinks); +int +GNUNET_DISK_file_get_identifiers (const char *filename, + uint64_t *dev, + uint64_t *ino); /** - * Create an (empty) temporary file on disk. - * - * @param template component to use for the name; + * Create an (empty) temporary file on disk. If the given name is not + * an absolute path, the current 'TMPDIR' will be prepended. In any case, + * 6 random characters will be appended to the name to create a unique + * filename. + * + * @param t component to use for the name; * does NOT contain "XXXXXX" or "/tmp/". * @return NULL on error, otherwise name of fresh * file on disk in directory for temporary files */ char * -GNUNET_DISK_mktemp (const char *template); +GNUNET_DISK_mktemp (const char *t); /** - * Open a file + * Create an (empty) temporary directory on disk. If the given name is not an + * absolute path, the current 'TMPDIR' will be prepended. In any case, 6 + * random characters will be appended to the name to create a unique name. + * + * @param t component to use for the name; + * does NOT contain "XXXXXX" or "/tmp/". + * @return NULL on error, otherwise name of freshly created directory + */ +char * +GNUNET_DISK_mkdtemp (const char *t); + + +/** + * Open a file. Note that the access permissions will only be + * used if a new file is created and if the underlying operating + * system supports the given permissions. + * * @param fn file name to be opened * @param flags opening flags, a combination of GNUNET_DISK_OPEN_xxx bit flags - * @param perm permissions for the newly created file + * @param perm permissions for the newly created file, use + * #GNUNET_DISK_PERM_NONE if a file could not be created by this + * call (because of flags) * @return IO handle on success, NULL on error */ -struct GNUNET_DISK_FileHandle *GNUNET_DISK_file_open (const char *fn, int flags, ...); +struct GNUNET_DISK_FileHandle * +GNUNET_DISK_file_open (const char *fn, + enum GNUNET_DISK_OpenFlags flags, + enum GNUNET_DISK_AccessPermissions perm); + + +/** + * Get the size of an open file. + * + * @param fh open file handle + * @param size where to write size of the file + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error + */ +int +GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh, + off_t *size); + /** * Creates an interprocess channel - * @param blocking creates an asynchronous pipe if set to GNUNET_NO + * + * @param blocking_read creates an asynchronous pipe for reading if set to #GNUNET_NO + * @param blocking_write creates an asynchronous pipe for writing if set to #GNUNET_NO + * @param inherit_read 1 to make read handle inheritable, 0 otherwise (NT only) + * @param inherit_write 1 to make write handle inheritable, 0 otherwise (NT only) * @return handle to the new pipe, NULL on error */ -struct GNUNET_DISK_PipeHandle *GNUNET_DISK_pipe (int blocking); +struct GNUNET_DISK_PipeHandle * +GNUNET_DISK_pipe (int blocking_read, + int blocking_write, + int inherit_read, + int inherit_write); + + +/** + * Creates a pipe object from a couple of file descriptors. + * Useful for wrapping existing pipe FDs. + * + * @param blocking_read creates an asynchronous pipe for reading if set to #GNUNET_NO + * @param blocking_write creates an asynchronous pipe for writing if set to #GNUNET_NO + * @param fd an array of two fd values. One of them may be -1 for read-only or write-only pipes + * + * @return handle to the new pipe, NULL on error + */ +struct GNUNET_DISK_PipeHandle * +GNUNET_DISK_pipe_from_fd (int blocking_read, + int blocking_write, + int fd[2]); + /** * Closes an interprocess channel * @param p pipe - * @return GNUNET_OK on success, GNUNET_SYSERR otherwise + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise + */ +int +GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p); + + +/** + * Closes one half of an interprocess channel + * + * @param p pipe to close end of + * @param end which end of the pipe to close + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise + */ +int +GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p, + enum GNUNET_DISK_PipeEnd end); + + +/** + * Detaches one of the ends from the pipe. + * Detached end is a fully-functional FileHandle, it will + * not be affected by anything you do with the pipe afterwards. + * Each end of a pipe can only be detched from it once (i.e. + * it is not duplicated). + * + * @param p pipe to detach an end from + * @param end which end of the pipe to detach + * @return Detached end on success, NULL on failure + * (or if that end is not present or is closed). */ -int GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p); +struct GNUNET_DISK_FileHandle * +GNUNET_DISK_pipe_detach_end (struct GNUNET_DISK_PipeHandle *p, + enum GNUNET_DISK_PipeEnd end); /** * Close an open file. * * @param h file handle - * @return GNUNET_OK on success, GNUNET_SYSERR otherwise + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ -int GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h); +int +GNUNET_DISK_file_close (struct GNUNET_DISK_FileHandle *h); + /** * Get the handle to a particular pipe end + * * @param p pipe - * @param n number of the end + * @param n end to access + * @return handle for the respective end + */ +const struct GNUNET_DISK_FileHandle * +GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p, + enum GNUNET_DISK_PipeEnd n); + + +#if WINDOWS +/** + * Get a GNUnet file handle from a W32 handle (W32-only). + * Do not call on non-W32 platforms (returns NULL). + * + * @param handle native handle + * @return GNUnet file handle corresponding to the W32 handle + */ +struct GNUNET_DISK_FileHandle * +GNUNET_DISK_get_handle_from_w32_handle (HANDLE osfh); +#endif + +/** + * Update POSIX permissions mask of a file on disk. If both argumets + * are #GNUNET_NO, the file is made world-read-write-executable (777). + * Does nothing on W32. + * + * @param fn name of the file to update + * @param require_uid_match #GNUNET_YES means 700 + * @param require_gid_match #GNUNET_YES means 770 unless @a require_uid_match is set + */ +void +GNUNET_DISK_fix_permissions (const char *fn, + int require_uid_match, + int require_gid_match); + + +/** + * Get a handle from a native integer FD. + * + * @param fno native integer file descriptor + * @return file handle corresponding to the descriptor + */ +struct GNUNET_DISK_FileHandle * +GNUNET_DISK_get_handle_from_int_fd (int fno); + + +/** + * Get a handle from a native FD. + * + * @param fd native file descriptor + * @return file handle corresponding to the descriptor */ -const struct GNUNET_DISK_FileHandle *GNUNET_DISK_pipe_handle (const struct - GNUNET_DISK_PipeHandle - *p, int n); +struct GNUNET_DISK_FileHandle * +GNUNET_DISK_get_handle_from_native (FILE *fd); + /** * Read the contents of a binary file into a buffer. + * * @param h handle to an open file * @param result the buffer to write the result to * @param len the maximum number of bytes to read - * @return the number of bytes read on success, GNUNET_SYSERR on failure + * @return the number of bytes read on success, #GNUNET_SYSERR on failure */ -ssize_t GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h, void *result, - size_t len); +ssize_t +GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h, + void *result, + size_t len); /** * Read the contents of a binary file into a buffer. - * @param fn file name + * Guarantees not to block (returns GNUNET_SYSERR and sets errno to EAGAIN + * when no data can be read). + * + * @param h handle to an open file * @param result the buffer to write the result to * @param len the maximum number of bytes to read - * @return number of bytes read, GNUNET_SYSERR on failure + * @return the number of bytes read on success, #GNUNET_SYSERR on failure */ -ssize_t GNUNET_DISK_fn_read (const char * const fn, void *result, - size_t len); +ssize_t +GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h, + void *result, + size_t len); /** - * Write a buffer to a file. + * Read the contents of a binary file into a buffer. * - * @param h handle to open file - * @param buffer the data to write - * @param n number of bytes to write - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @param fn file name + * @param result the buffer to write the result to + * @param len the maximum number of bytes to read + * @return number of bytes read, #GNUNET_SYSERR on failure */ -ssize_t GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h, - const void *buffer, - size_t n); +ssize_t +GNUNET_DISK_fn_read (const char *fn, + void *result, + size_t len); /** - * Write a buffer to a file. If the file is longer than - * the given buffer size, it will be truncated. + * Write a buffer to a file. * - * @param fn file name + * @param h handle to open file * @param buffer the data to write * @param n number of bytes to write - * @return number of bytes written on success, GNUNET_SYSERR on error - */ -ssize_t GNUNET_DISK_fn_write (const char * fn, - const void *buffer, - size_t n, - int mode); - - -/** - * Copy a file. - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return number of bytes written on success, #GNUNET_SYSERR on error */ -int GNUNET_DISK_file_copy (const char *src, const char *dst); +ssize_t +GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h, + const void *buffer, + size_t n); /** - * Scan a directory for files. The name of the directory - * must be expanded first (!). + * Write a buffer to a file, blocking, if necessary. * - * @param dirName the name of the directory - * @param callback the method to call for each file - * @param data argument to pass to callback - * @return the number of files found, -1 on error - */ -int GNUNET_DISK_directory_scan (const char *dirName, - GNUNET_FileNameCallback callback, - void *data); - - -/** - * Opaque handle used for iterating over a directory. + * @param h handle to open file + * @param buffer the data to write + * @param n number of bytes to write + * @return number of bytes written on success, #GNUNET_SYSERR on error */ -struct GNUNET_DISK_DirectoryIterator; +ssize_t +GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h, + const void *buffer, + size_t n); /** - * Function called to iterate over a directory. + * Write a buffer to a file. If the file is longer than + * the given buffer size, it will be truncated. * - * @param cls closure - * @param di argument to pass to "GNUNET_DISK_directory_iterator_next" to - * get called on the next entry (or finish cleanly) - * @param filename complete filename (absolute path) - * @param dirname directory name (absolute path) + * @param fn file name + * @param buffer the data to write + * @param n number of bytes to write + * @param mode file permissions + * @return number of bytes written on success, #GNUNET_SYSERR on error */ -typedef void (*GNUNET_DISK_DirectoryIteratorCallback) (void *cls, - struct - GNUNET_DISK_DirectoryIterator - * di, - const char *filename, - const char *dirname); +ssize_t +GNUNET_DISK_fn_write (const char *fn, + const void *buffer, + size_t n, + enum GNUNET_DISK_AccessPermissions mode); /** - * This function must be called during the DiskIteratorCallback - * (exactly once) to schedule the task to process the next - * filename in the directory (if there is one). + * Copy a file. * - * @param iter opaque handle for the iterator - * @param can set to GNUNET_YES to terminate the iteration early - * @return GNUNET_YES if iteration will continue, - * GNUNET_NO if this was the last entry (and iteration is complete), - * GNUNET_SYSERR if "can" was YES + * @param src file to copy + * @param dst destination file name + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ -int GNUNET_DISK_directory_iterator_next (struct GNUNET_DISK_DirectoryIterator - *iter, int can); +int +GNUNET_DISK_file_copy (const char *src, + const char *dst); /** - * Scan a directory for files using the scheduler to run a task for - * each entry. The name of the directory must be expanded first (!). - * If a scheduler does not need to be used, GNUNET_DISK_directory_scan - * may provide a simpler API. + * Scan a directory for files. * - * @param sched scheduler to use - * @param prio priority to use - * @param dirName the name of the directory + * @param dir_name the name of the directory * @param callback the method to call for each file - * @param callback_cls closure for callback + * @param callback_cls closure for @a callback + * @return the number of files found, -1 on error */ -void GNUNET_DISK_directory_iterator_start (struct GNUNET_SCHEDULER_Handle - *sched, - enum GNUNET_SCHEDULER_Priority - prio, const char *dirName, - GNUNET_DISK_DirectoryIteratorCallback - callback, void *callback_cls); +int +GNUNET_DISK_directory_scan (const char *dir_name, + GNUNET_FileNameCallback callback, + void *callback_cls); /** @@ -334,86 +674,96 @@ void GNUNET_DISK_directory_iterator_start (struct GNUNET_SCHEDULER_Handle * a file. * * @param filename name of a file in the directory - * @returns GNUNET_OK on success, GNUNET_SYSERR on failure, - * GNUNET_NO if directory exists but is not writeable + * @returns #GNUNET_OK on success, #GNUNET_SYSERR on failure, + * #GNUNET_NO if directory exists but is not writeable */ -int GNUNET_DISK_directory_create_for_file (const char *filename); +int +GNUNET_DISK_directory_create_for_file (const char *filename); /** - * Test if fil is a directory that can be accessed. - * Will not print an error message if the directory - * does not exist. Will log errors if GNUNET_SYSERR is - * returned. + * Test if @a fil is a directory and listable. Optionally, also check if the + * directory is readable. Will not print an error message if the directory does + * not exist. Will log errors if #GNUNET_SYSERR is returned (i.e., a file exists + * with the same name). * - * @return GNUNET_YES if yes, GNUNET_NO if does not exist, GNUNET_SYSERR - * on any error and if exists but not directory + * @param fil filename to test + * @param is_readable #GNUNET_YES to additionally check if @a fil is readable; + * #GNUNET_NO to disable this check + * @return #GNUNET_YES if yes, #GNUNET_NO if not; #GNUNET_SYSERR if it + * does not exist or `stat`ed */ -int GNUNET_DISK_directory_test (const char *fil); +int +GNUNET_DISK_directory_test (const char *fil, int is_readable); /** * Remove all files in a directory (rm -rf). Call with * caution. * - * @param fileName the file to remove - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @param filename the file to remove + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ -int GNUNET_DISK_directory_remove (const char *fileName); +int +GNUNET_DISK_directory_remove (const char *filename); /** * Implementation of "mkdir -p" * * @param dir the directory to create - * @returns GNUNET_SYSERR on failure, GNUNET_OK otherwise + * @returns #GNUNET_SYSERR on failure, #GNUNET_OK otherwise */ -int GNUNET_DISK_directory_create (const char *dir); +int +GNUNET_DISK_directory_create (const char *dir); /** - * Lock a part of a file + * Lock a part of a file. + * * @param fh file handle - * @lockStart absolute position from where to lock - * @lockEnd absolute position until where to lock - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @param lock_start absolute position from where to lock + * @param lock_end absolute position until where to lock + * @param excl #GNUNET_YES for an exclusive lock + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_DISK_file_lock(struct GNUNET_DISK_FileHandle *fh, off_t lockStart, - off_t lockEnd); +GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, + off_t lock_start, + off_t lock_end, int excl); + + +/** + * Unlock a part of a file. + * + * @param fh file handle + * @param unlock_start absolute position from where to unlock + * @param unlock_end absolute position until where to unlock + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error + */ +int +GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, + off_t unlock_start, + off_t unlock_end); /** * @brief Removes special characters as ':' from a filename. * @param fn the filename to canonicalize */ -void GNUNET_DISK_filename_canonicalize (char *fn); +void +GNUNET_DISK_filename_canonicalize (char *fn); /** * @brief Change owner of a file * @param filename file to change * @param user new owner of the file - * @return GNUNET_OK on success, GNUNET_SYSERR on failure - */ -int GNUNET_DISK_file_change_owner (const char *filename, const char *user); - - -/** - * Construct full path to a file inside of the private - * directory used by GNUnet. Also creates the corresponding - * directory. If the resulting name is supposed to be - * a directory, end the last argument in '/' (or pass - * DIR_SEPARATOR_STR as the last argument before NULL). - * - * @param serviceName name of the service asking - * @param varargs is NULL-terminated list of - * path components to append to the - * private directory name. - * @return the constructed filename + * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure */ -char *GNUNET_DISK_get_home_filename (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *serviceName, ...); +int +GNUNET_DISK_file_change_owner (const char *filename, + const char *user); /** @@ -425,28 +775,36 @@ struct GNUNET_DISK_MapHandle; * Map a file into memory * @param h open file handle * @param m handle to the new mapping (will be set) - * @param access access specification, GNUNET_DISK_MAP_xxx + * @param access access specification, GNUNET_DISK_MAP_TYPE_xxx * @param len size of the mapping * @return pointer to the mapped memory region, NULL on failure */ -void *GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h, - struct GNUNET_DISK_MapHandle **m, - int access, size_t len); +void * +GNUNET_DISK_file_map (const struct GNUNET_DISK_FileHandle *h, + struct GNUNET_DISK_MapHandle **m, + enum GNUNET_DISK_MapType access, + size_t len); + /** * Unmap a file * * @param h mapping handle - * @return GNUNET_OK on success, GNUNET_SYSERR otherwise + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ -int GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h); +int +GNUNET_DISK_file_unmap (struct GNUNET_DISK_MapHandle *h); + /** * Write file changes to disk + * * @param h handle to an open file - * @return GNUNET_OK on success, GNUNET_SYSERR otherwise + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ -int GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h); +int +GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h); + #if 0 /* keep Emacsens' auto-indent happy */ { @@ -455,7 +813,9 @@ int GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h); } #endif - /* ifndef GNUNET_DISK_LIB_H */ #endif + +/** @} */ /* end of group */ + /* end of gnunet_disk_lib.h */