Merge branch 't/image-0.5'

[paraslash.git] / stdin.h

diff --git a/stdin.h b/stdin.h
index edb72cf894e6f2bf8e7d994f6dea0b45e83ebb5d..cdf0c67fd57a1078f38a9f175d598adf65ece520 100644 (file)
--- a/stdin.h
+++ b/stdin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,18 +8,16 @@
 
 /** The task structure used for reading from stdin. */
 struct stdin_task {
-       /** Input buffer. */
-       char *buf;
-       /** The size of \a buf. */
-       size_t bufsize;
-       /** Number of bytes currently loaded in \a buf. */
-       size_t loaded;
-       /** Pointer to the error member of the consumer. */
-       int *output_error;
-       /** Whether \p STDIN_FILENO was included in the read fd set. */
-       int check_fd;
        /** The task structure. */
        struct task task;
+       /** Stdin is always the root of a buffer tree. */
+       struct btr_node *btrn;
+       /** Use a buffer pool to minimize memcpy due to alignment problems. */
+       struct btr_pool *btrp;
+       /** The descriptor flags of STDIN at startup. */
+       int fd_flags;
+       /** Whether we have to set STDIN to nonblocking mode. */
+       bool must_set_nonblock_flag;
 };
 
 void stdin_set_defaults(struct stdin_task *sit);