Merge branch 'maint' into next

[paraslash.git] / fd.h

diff --git a/fd.h b/fd.h
index 6e333d91359345e2d26bf02accfe5e2d39419e2d..a21cd9f2caeae59a8d2e12a294777f38c738d506 100644 (file)
--- a/fd.h
+++ b/fd.h
@@ -1,19 +1,21 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file fd.h exported symbols from fd.c */
 
+int write_all(int fd, const char *buf, size_t *len);
 int file_exists(const char *);
 int para_select(int n, fd_set *readfds, fd_set *writefds,
                struct timeval *timeout_tv);
-int mark_fd_nonblocking(int fd);
-int mark_fd_blocking(int fd);
+__must_check int mark_fd_nonblocking(int fd);
+__must_check int mark_fd_blocking(int fd);
 void para_fd_set(int fd, fd_set *fds, int *max_fileno);
 __must_check int para_fgets(char *line, int size, FILE *f);
-void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset);
+int para_mmap(size_t length, int prot, int flags, int fd, off_t offset,
+               void *map);
 int para_open(const char *path, int flags, mode_t mode);
 int para_opendir(const char *dirname, DIR **dir, int *cwd);
 int para_mkdir(const char *path, mode_t mode);
@@ -23,3 +25,8 @@ int mmap_full_file(const char *filename, int open_mode, void **map,
        size_t *size, int *fd_ptr);
 int para_munmap(void *start, size_t length);
 int write_ok(int fd);
+void valid_fd_012(void);
+int write_nonblock(int fd, const char *buf, size_t len,
+               size_t max_bytes_per_write);
+int for_each_file_in_dir(const char *dirname,
+               int (*func)(const char *, void *), void *private_data);