X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stdin.c;h=649d464b485142263c768dbfb4698519d3c5aee2;hp=b86fbbb9a635448a10f6375915fa6620bfb9fc1d;hb=eca9a02137e172d28f8ed2ab2272a4c8bff2953d;hpb=95491e280363ddaed05599445138fd8191110dc1

diff --git a/stdin.c b/stdin.c
index b86fbbb9..649d464b 100644
--- a/stdin.c
+++ b/stdin.c
@@ -1,23 +1,15 @@
 /*
  * 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 */
 
+#include <dirent.h> /* readdir() */
+#include <assert.h>
+
+
 #include "para.h"
 #include "string.h"
 #include "list.h"
@@ -33,10 +25,10 @@
  * \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)
+static void stdin_pre_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = t->private_data;
 	t->ret = 1;
@@ -59,12 +51,12 @@ 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.
  */
-void stdin_post_select(struct sched *s, struct task *t)
+static void stdin_post_select(struct sched *s, struct task *t)
 {
 	struct stdin_task *sit = t->private_data;
 	ssize_t ret;
@@ -87,12 +79,12 @@ void stdin_post_select(struct sched *s, struct task *t)
 }
 
 /**
- * initialize a stdin task structure with default values
+ * Initialize a stdin task structure with default values.
  *
- * \param sit the stdin task structure
+ * \param sit The stdin task structure.
  *
  * This fills in the pre/post select function poinzters of the task structure
- * given by \a sot. It also sets up a default error handler which unregisters
+ * given by \a sit. It also sets up a default error handler which unregisters
  * the task. Moreover, \a loaded and \a eof are set to zero and \a bufsize is
  * initialized to 16 KB (but no buffer is allocated).
  */
@@ -105,5 +97,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_nonblocking(STDIN_FILENO);
 	sprintf(sit->task.status, "stdin reader");
 }