X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/32fc582f43a9a3841d2782674e055113729c2814..5e7a5e2d42c1b06f249debca72c10ad33d157402:/log.c

diff --git a/log.c b/log.c
index 6dbf25a..3748f91 100644
--- a/log.c
+++ b/log.c
@@ -189,6 +189,59 @@ static void log_vmulti(void *sst, int class, const char *message, va_list args)
     }
 }
 
+void lg_vperror(struct log_if *lg, const char *desc, struct cloc *loc,
+		int class, int errnoval, const char *fmt, va_list al)
+{
+    int status=current_phase;
+    int esave=errno;
+
+    if (!lg)
+	lg=system_log;
+
+    if (class & M_FATAL)
+	enter_phase(PHASE_SHUTDOWN);
+
+    slilog_part(lg,class,"%s",desc);
+    if (loc)
+	slilog_part(lg,class," (%s:%d)",loc->file,loc->line);
+    slilog_part(lg,class,": ");
+    vslilog_part(lg,class,fmt,al);
+    if (errnoval)
+	slilog_part(lg,class,": %s",strerror(errnoval));
+    slilog_part(lg,class,"\n");
+
+    if (class & M_FATAL)
+	exit(status);
+
+    errno=esave;
+}
+
+void lg_perror(struct log_if *lg, const char *desc, struct cloc *loc,
+	       int class, int errnoval, const char *fmt, ...)
+{
+    va_list al;
+    va_start(al,fmt);
+    lg_vperror(lg,desc,loc,class,errnoval,fmt,al);
+    va_end(al);
+}
+
+void lg_exitstatus(struct log_if *lg, const char *desc, struct cloc *loc,
+		   int class, int status, const char *progname)
+{
+    if (!status)
+	lg_perror(lg,desc,loc,class,0,"%s exited",progname);
+    else if (WIFEXITED(status))
+	lg_perror(lg,desc,loc,class,0,"%s exited with error exit status %d",
+		  progname,WEXITSTATUS(status));
+    else if (WIFSIGNALED(status))
+	lg_perror(lg,desc,loc,class,0,"%s died due to fatal signal %s (%d)%s",
+		  progname,strsignal(WTERMSIG(status)),WTERMSIG(status),
+		  WCOREDUMP(status)?" (core dumped)":"");
+    else
+	lg_perror(lg,desc,loc,class,0,"%s died with unknown wait status %d",
+		  progname,status);
+}
+
 struct log_if *init_log(list_t *ll)
 {
     int i=0;