From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 29 Oct 2011 12:51:37 +0000 (+0200)
Subject: Fix read_schedule() not to fclose(stdin)
X-Git-Tag: v4.3.29~48
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=5a77a8186e9d3cd6bcc34c0189bda1f90020ae4a

Fix read_schedule() not to fclose(stdin)

Did that since the initial commit 71320ed6, v4.3.10.
---

diff --git a/src/lib/common/rdsched.c b/src/lib/common/rdsched.c
index 4065a4234..62a52200d 100644
--- a/src/lib/common/rdsched.c
+++ b/src/lib/common/rdsched.c
@@ -27,7 +27,7 @@
  *  rdsched.c: Read update schedule
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2007-2010
+ *     Markus Armbruster, 2007-2011
  */
 
 #define _XOPEN_SOURCE 500
@@ -74,10 +74,8 @@ read_schedule(char *fname, time_t sched[], int n, time_t t0, time_t anchor)
 		     fname, strerror(errno));
 	    return -1;
 	}
-    } else {
+    } else
 	fp = stdin;
-	fname = "<stdin>";
-    }
 
     ret = lno = 0;
     sched[0] = 0;
@@ -86,13 +84,15 @@ read_schedule(char *fname, time_t sched[], int n, time_t t0, time_t anchor)
 	endp = strchr(buf, '#');
 	if (endp)
 	    *endp = 0;
-	if (parse_schedule_line(buf, sched, n, t0, &anchor, fname, lno)) {
+	if (parse_schedule_line(buf, sched, n, t0, &anchor,
+				fname ? fname : "<stdin>", lno)) {
 	    ret = -1;
 	    break;
 	}
     }
 
-    fclose(fp);
+    if (fname)
+	fclose(fp);
     return ret;
 }