remove sprint from ip Reference: /n/atom/patch/applied/ipnosprint Date: Sun Aug 16 18:58:20 CES 2015 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/ip/arp.c Sun Aug 16 18:57:47 2015 +++ /sys/src/nix/ip/arp.c Sun Aug 16 18:57:48 2015 @@ -213,10 +213,10 @@ v4tov6(v6ip, ip); ip = v6ip; } + hash = haship(ip); qlock(arp); type = ifc->m; - hash = haship(ip); for(a = arp->hash[hash]; a; a = a->hash){ if(memcmp(ip, a->ip, sizeof(a->ip)) == 0) if(type == a->type) @@ -519,13 +519,11 @@ Alinelen= 90, }; -char *aformat = "%-6.6s %-8.8s %-40.40I %-32.32s\n"; - static void convmac(char *p, uchar *mac, int n) { while(n-- > 0) - p += sprint(p, "%2.2ux", *mac++); + p += snprint(p, 3, "%2.2ux", *mac++); } int @@ -552,7 +550,8 @@ len--; qlock(arp); convmac(mac, a->mac, a->type->maclen); - n += sprint(p+n, aformat, a->type->name, arpstate[a->state], a->ip, mac); + n += snprint(p+n, Alinelen+1, "%-6.6s %-8.8s %-40.40I %-32.32s\n", + a->type->name, arpstate[a->state], a->ip, mac); qunlock(arp); } --- /sys/src/nix/ip/chandial.c Sun Aug 16 18:57:50 2015 +++ /sys/src/nix/ip/chandial.c Sun Aug 16 18:57:51 2015 @@ -66,7 +66,7 @@ name[n] = 0; for(p = name; *p == ' '; p++) ; - sprint(name, "%lud", strtoul(p, 0, 0)); + snprint(name, sizeof name, "%lud", strtoul(p, 0, 0)); p = strrchr(clone, '/'); *p = 0; if(ds->dir) --- /sys/src/nix/ip/icmp6.c Sun Aug 16 18:57:54 2015 +++ /sys/src/nix/ip/icmp6.c Sun Aug 16 18:57:56 2015 @@ -757,7 +757,7 @@ case TimeExceedV6: if(p->code == 0){ - sprint(m2, "ttl exceeded at %I", p->src); + snprint(m2, sizeof m2, "ttl exceeded at %I", p->src); bp->rp += IPICMPSZ; if(blocklen(bp) < 8){ --- /sys/src/nix/ip/il.c Sun Aug 16 18:57:59 2015 +++ /sys/src/nix/ip/il.c Sun Aug 16 18:58:00 2015 @@ -1247,7 +1247,7 @@ if(ipriv->ackprocstarted == 0){ qlock(&ipriv->apl); if(ipriv->ackprocstarted == 0){ - sprint(kpname, "#I%dilack", c->p->f->dev); + snprint(kpname, sizeof kpname, "#I%dilack", c->p->f->dev); kproc(kpname, ilackproc, c->p); ipriv->ackprocstarted = 1; } --- /sys/src/nix/ip/iproute.c Sun Aug 16 18:58:03 2015 +++ /sys/src/nix/ip/iproute.c Sun Aug 16 18:58:04 2015 @@ -651,7 +651,7 @@ * this code is not in rr to reduce stack size */ static void -sprintroute(Route *r, Routewalk *rw) +snprintroute(Route *r, Routewalk *rw) { int nifc, n; char t[5], *iname, ifbuf[5]; @@ -731,7 +731,7 @@ rw.p = p; rw.e = p+n; rw.o = -offset; - rw.walk = sprintroute; + rw.walk = snprintroute; ipwalkroutes(f, &rw);