code review 186263: eliminate the package global name space assumption in o...

src/cmd/5l/obj.c

 // Inferno utils/5l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/obj.c
 //
 //      Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 //      Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 //      Portions Copyright © 1997-1999 Vita Nuova Limited
 //      Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 //      Portions Copyright © 2004,2006 Bruce Ellis
 //      Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
 //      Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
@@ skipping 241 matching lines @@
         dtype = 4;
         nuxiinit();
 
         version = 0;
         cbp = buf.cbuf;
         cbc = sizeof(buf.cbuf);
         firstp = prg();
         lastp = firstp;
 
         while(*argv)
-                objfile(*argv++);
+                objfile(*argv++, "main");
         if(!debug['l'])
                 loadlib();
 
         // mark some functions that are only referenced after linker code editing
         // TODO(kaib): this doesn't work, the prog can't be found in runtime
         for(i=0; i<nelem(linkername); i++)
                 mark(lookup(linkername[i], 0));
         deadcode();
 
         firstp = firstp->link;
@@ skipping 165 matching lines @@
 ldobj1(Biobuf *f, int64 len, char *pn)
 {
         int32 ipc;
         Prog *p, *t;
         Sym *h[NSYM], *s, *di;
         int v, o, r, skip;
         uint32 sig;
         char *name;
         int ntext;
         int32 eof;
-        char src[1024];
+        char src[1024], *x;
 
         ntext = 0;
         eof = Boffset(f) + len;
         di = S;
         src[0] = 0;
 
 newloop:
         memset(h, 0, sizeof(h));
         version++;
         histfrogp = 0;
@@ skipping 22 matching lines @@
                 if(v == D_STATIC)
                         r = version;
                 name = Brdline(f, '\0');
                 if(name == nil) {
                         if(Blinelen(f) > 0) {
                                 fprint(2, "%s: name too long\n", pn);
                                 errorexit();
                         }
                         goto eof;
                 }
-                s = lookup(name, r);
+                x = expandpkg(name, pkg);
+                s = lookup(x, r);
+                if(x != name)
+                        free(x);
+                name = nil;
 
                 if(sig != 0){
                         if(s->sig != 0 && s->sig != sig)
                                 diag("incompatible type signatures %lux(%s) and %lux(%s) for %s", s->sig, s->file, sig, pn, s->name);
                         s->sig = sig;
                         s->file = pn;
                 }
 
                 if(debug['W'])
                         print(" ANAME   %s\n", s->name);
@@ skipping 550 matching lines @@
 appendp(Prog *q)
 {
         Prog *p;
 
         p = prg();
         p->link = q->link;
         q->link = p;
         p->line = q->line;
         return p;
 }