Merge remote branch 'refs/remotes/fml/master'

[paraslash.git] / stdin.h

diff --git a/stdin.h b/stdin.h
index 63d00d5..a1983dd 100644 (file)
--- a/stdin.h
+++ b/stdin.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -8,16 +8,12 @@
 
 /** The task structure used for reading from stdin. */
 struct stdin_task {
 
 /** 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;
-       /** Whether \p STDIN_FILENO was included in the read fd set. */
-       int check_fd;

        /** The task structure. */
        struct task task;
        /** 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;

 };
 
 void stdin_set_defaults(struct stdin_task *sit);
 };
 
 void stdin_set_defaults(struct stdin_task *sit);