Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / stdin.c

diff --git a/stdin.c b/stdin.c
index b86fbbb9a635448a10f6375915fa6620bfb9fc1d..d9f9bd936590985bf32a8351738bbf875c4a5478 100644 (file)
--- a/stdin.c
+++ b/stdin.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
  *
- *     This program 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 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file stdin.c functions that deal with reading from stdin */
@@ -33,7 +21,7 @@
  * \param t the task structure of the stdin task
  *
  * This function is always successful. If there is space left in the
- * buffer of the stdin task, it adds \a STDIN_FILENO to the read fd set
+ * buffer of the stdin task, it adds \p STDIN_FILENO to the read fd set
  * of \a s.
  */
 void stdin_pre_select(struct sched *s, struct task *t)
@@ -59,8 +47,8 @@ static void stdin_default_event_handler(struct task *t)
  * \param s the scheduler this task was registered to
  * \param t the task structure of the stdin task
  *
- * This function checks if \a STDIN_FILENO was included by in the read fd set
- * of \a s during the previous pre_select call.  If yes, and STDIN_FILENO
+ * This function checks if \p STDIN_FILENO was included by in the read fd set
+ * of \a s during the previous pre_select call.  If yes, and \p STDIN_FILENO
  * appeears to be readable, data is read from stdin into the buffer of the
  * stdin task.
  */
@@ -105,5 +93,6 @@ void stdin_set_defaults(struct stdin_task *sit)
        sit->task.post_select = stdin_post_select;
        sit->task.event_handler = stdin_default_event_handler;
        sit->task.private_data = sit;
+       mark_fd_nonblock(STDIN_FILENO);
        sprintf(sit->task.status, "stdin reader");
 }