From a57bf4070aa7f8e11bf4659ae52169fed1585605 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 17 Dec 2012 21:07:27 +0000
Subject: [PATCH] log/syslog: Solaris portability patches.

From-SVN: r194566
---
 libgo/go/log/syslog/syslog_libc.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/libgo/go/log/syslog/syslog_libc.go b/libgo/go/log/syslog/syslog_libc.go
index fb98ad78060..2d14d5d20a8 100644
--- a/libgo/go/log/syslog/syslog_libc.go
+++ b/libgo/go/log/syslog/syslog_libc.go
@@ -10,7 +10,9 @@ package syslog
 
 import (
 	"fmt"
+	"os"
 	"syscall"
+	"time"
 )
 
 func unixSyslog() (conn serverConn, err error) {
@@ -21,14 +23,17 @@ type libcConn int
 
 func syslog_c(int, *byte)
 
-func (libcConn) writeBytes(p Priority, prefix string, b []byte) (int, error) {
-	syslog_c(int(p), syscall.StringBytePtr(fmt.Sprintf("%s: %s", prefix, b)))
-	return len(b), nil
-}
-
-func (libcConn) writeString(p Priority, prefix string, s string) (int, error) {
-	syslog_c(int(p), syscall.StringBytePtr(fmt.Sprintf("%s: %s", prefix, s)))
-	return len(s), nil
+func (libcConn) writeString(p Priority, hostname, tag, msg string) (int, error) {
+	timestamp := time.Now().Format(time.RFC3339)
+	log := fmt.Sprintf("%s %s %s[%d]: %s", timestamp, hostname, tag, os.Getpid(), msg)
+	buf, err := syscall.BytePtrFromString(log)
+	if err != nil {
+		return 0, err
+	}
+	syscall.Entersyscall()
+	syslog_c(int(p), buf)
+	syscall.Exitsyscall()
+	return len(msg), nil
 }
 
 func (libcConn) close() error {