code review 1706053: ld: fix handling of "". names in #pragma dynimport/dynexport

ld: fix handling of "". names in #pragma dynimport/dynexport

Fixes issue 728.

[rsc, 2010-07-02 02:41:48]

Hello r (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[r2, 2010-07-02 03:23:34]

LGTM

On Jul 1, 2010, at 7:41 PM, rsc@golang.org wrote:

> Reviewers: r,
> 
> Message:
> Hello r (cc: golang-dev@googlegroups.com),
> 
> I'd like you to review this change.
> 
> 
> Description:
> ld: fix handling of "". names in #pragma dynimport/dynexport
> 
> Fixes issue 728.
> 
> Please review this at http://codereview.appspot.com/1706053/show
> 
> Affected files:
>  M misc/cgo/stdio/file.go
>  M misc/cgo/stdio/hello.go
>  M src/cmd/ld/go.c
> 
> 
> Index: misc/cgo/stdio/file.go
> ===================================================================
> --- a/misc/cgo/stdio/file.go
> +++ b/misc/cgo/stdio/file.go
> @@ -17,6 +17,8 @@
> #include <stdlib.h>
> 
> void fflushstdout(void) { fflush(stdout); }
> +
> +char* greeting = "hello, world";
> */
> import "C"
> import "unsafe"
> @@ -34,6 +36,8 @@
> }
> */
> 
> +var Greeting = C.GoString(C.greeting)
> +
> func Puts(s string) {
> 	p := C.CString(s)
> 	C.puts(p)
> Index: misc/cgo/stdio/hello.go
> ===================================================================
> --- a/misc/cgo/stdio/hello.go
> +++ b/misc/cgo/stdio/hello.go
> @@ -8,5 +8,5 @@
> 
> func main() {
> 	//	stdio.Stdout.WriteString("hello, world\n");
> -	stdio.Puts("hello, world")
> +	stdio.Puts(stdio.Greeting)
> }
> Index: src/cmd/ld/go.c
> ===================================================================
> --- a/src/cmd/ld/go.c
> +++ b/src/cmd/ld/go.c
> @@ -66,7 +66,7 @@
> }
> 
> static void loadpkgdata(char*, char*, char*, int);
> -static void loaddynimport(char*, char*, int);
> +static void loaddynimport(char*, char*, char*, int);
> static void loaddynexport(char*, char*, char*, int);
> static int parsemethod(char**, char*, char**);
> static int parsepkgdata(char*, char*, char**, char*, char**, char**, char**);
> @@ -194,7 +194,7 @@
> 				errorexit();
> 			return;
> 		}
> -		loaddynimport(filename, p0 + 1, p1 - (p0+1));
> +		loaddynimport(filename, pkg, p0 + 1, p1 - (p0+1));
> 	}
> 
> 	// look for dynexp section
> @@ -397,7 +397,7 @@
> }
> 
> static void
> -loaddynimport(char *file, char *p, int n)
> +loaddynimport(char *file, char *pkg, char *p, int n)
> {
> 	char *pend, *next, *name, *def, *p0, *lib;
> 	Sym *s;
> @@ -432,6 +432,8 @@
> 		*strchr(name, ' ') = 0;
> 		*strchr(def, ' ') = 0;
> 
> +		name = expandpkg(name, pkg);
> +
> 		s = lookup(name, 0);
> 		s->dynimplib = lib;
> 		s->dynimpname = def;
> 
> 

[rsc, 2010-07-02 04:48:16]

*** Submitted as http://code.google.com/p/go/source/detail?r=62a3fed542d3 ***

ld: fix handling of "". names in #pragma dynimport/dynexport

Fixes issue 728.

R=r
CC=golang-dev
http://codereview.appspot.com/1706053