From fa4bef8080b75d2c8c75169667c7ba1b4a124232 Mon Sep 17 00:00:00 2001
Message-Id: <fa4bef8080b75d2c8c75169667c7ba1b4a124232.1713916950.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 22 Feb 2001 09:06:08 +0000
Subject: [PATCH] Fix logfile rotation to avoid program collapse.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 client.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/client.c b/client.c
index 019d68f1..c1abe68e 100644
--- a/client.c
+++ b/client.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: client.c,v 1.5 2001/02/16 21:23:39 mdw Exp $
+ * $Id: client.c,v 1.6 2001/02/22 09:06:08 mdw Exp $
  *
  * Client for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: client.c,v $
+ * Revision 1.6  2001/02/22 09:06:08  mdw
+ * Fix logfile rotation to avoid program collapse.
+ *
  * Revision 1.5  2001/02/16 21:23:39  mdw
  * Use reliable signal handling for reopening logs.
  *
@@ -198,13 +201,24 @@ static void uline(char *p, void *b)
 
 static void logfile(const char *name)
 {
-  if (logfp)
-    fclose(logfp);
-  if ((logfp = fopen(name, "a")) == 0) {
-    die(EXIT_FAILURE, "error opening logfile `%s': %s",
-	name, strerror(errno));
+  FILE *fp;
+
+  if ((fp = fopen(name, "a")) != 0) {
+    if (logfp)
+      fclose(logfp);
+    logfp =  fp;
+    setvbuf(logfp, 0, _IOLBF, BUFSIZ);
+  } else {
+    dstr d = DSTR_INIT;
+    dstr_putf(&d, "error opening logfile `%s': %s", name, strerror(errno));
+    if (logfp)
+      writelog("error", d.buf);
+    else if (logname)
+      die(EXIT_FAILURE, d.buf);
+    if (f & f_syslog)
+      syslog(LOG_ERR, d.buf);
+    dstr_destroy(&d);
   }
-  setvbuf(logfp, 0, _IOLBF, BUFSIZ);
 }
 
 static void sighup(int sig, void *v)
-- 
[mdw]