Re: libgo patch committed: Update to current library

[Ian Lance Taylor <iant@google.com>]

[-- Attachment #1: Type: text/plain, Size: 993 bytes --]

On Mon, Dec 17, 2012 at 6:49 AM, Rainer Orth
<ro@cebitec.uni-bielefeld.de> wrote:
> Ian Lance Taylor <iant@google.com> writes:
>
>> I've updated libgo to the current master Go library sources.  As usual
>> this e-mail only includes patches to files that are substantially
>> specific to gccgo.  The bulk of the patch is available from the
>> repository or from the master Go repository.  Bootstrapped and ran Go
>> testsuite on x86_64-unknown-linux-gnu.  Committed to mainline.
>
> This patch broke Solaris bootstrap:
>
> /vol/gcc/src/hg/trunk/local/libgo/go/log/syslog/syslog_libc.go:17:9: error: incompatible type for return value 1 (incompatible type for method 'writeString' (different number of parameters))
>   return libcConn(0), nil
>          ^

Sorry about that.  This patch should fix the build.  I have not yet
tested whether it passes the tests.  Bootstrapped on
x86_64-unknown-linux-gnu, which proves nothing since the file is not
used on GNU/Linux.  Committed to mainline.

Ian

[-- Attachment #2: foo.patch --]
[-- Type: application/octet-stream, Size: 1165 bytes --]

diff -r 16989f6d7711 libgo/go/log/syslog/syslog_libc.go
--- a/libgo/go/log/syslog/syslog_libc.go	Fri Dec 14 06:54:14 2012 -0800
+++ b/libgo/go/log/syslog/syslog_libc.go	Mon Dec 17 13:06:13 2012 -0800
@@ -10,7 +10,9 @@
 
 import (
 	"fmt"
+	"os"
 	"syscall"
+	"time"
 )
 
 func unixSyslog() (conn serverConn, err error) {
@@ -21,14 +23,17 @@
 
 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 {