bozo-log-fix-20060119

don't fclose(NULL) (found by ober@linbsd.org)
fflush after printf instead of before
add missing trailing newline in WARNING message
consolidate the logic to make it clearer
make tdate bigger (26 chars plus '\0'; not sure this is needed)

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index 6162dbb9fea34f3555ee155227629fee41b614bc..eea7bbafe061b39b99e87955a852942f91254546 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -1025,7 +1025,7 @@ main(int argc, char **argv, char **envp)
 void
 bozo_Log(char *a, char *b, char *c, char *d, char *e, char *f)
 {
-    char tdate[26];
+    char tdate[27];
     time_t myTime;
 
     if (DoSyslog) {
@@ -1041,21 +1041,17 @@ bozo_Log(char *a, char *b, char *c, char *d, char *e, char *f)
 
        bozo_logFile = fopen(AFSDIR_SERVER_BOZLOG_FILEPATH, "a");
        if (bozo_logFile == NULL) {
-           printf("bosserver: WARNING: problem with %s",
+           printf("bosserver: WARNING: problem with %s\n",
                   AFSDIR_SERVER_BOZLOG_FILEPATH);
+           printf("%s ", tdate);
+           printf(a, b, c, d, e, f);
            fflush(stdout);
-       }
-
-       if (bozo_logFile) {
+       } else {
            fprintf(bozo_logFile, "%s ", tdate);
            fprintf(bozo_logFile, a, b, c, d, e, f);
-           fflush(bozo_logFile);
-       } else {
-           printf("%s ", tdate);
-           printf(a, b, c, d, e, f);
-       }
 
-       /* close so rm BosLog works */
-       fclose(bozo_logFile);
+           /* close so rm BosLog works */
+           fclose(bozo_logFile);
+       }
     }
 }