shithub: front

Info  •  Files  •  Log  •  Branches

ip/ipconfig: ndbvalfmt() strings when formatting ndb entries.

--- a/sys/src/cmd/ip/ipconfig/dhcp.c

+++ b/sys/src/cmd/ip/ipconfig/dhcp.c

@@ -909,7 +909,7 @@

 		break;

 	case Tstr:

 		if(optgetstr(p, opt, str, sizeof str))

-			s = smprint("%s=%s", o->name, str);

+			s = smprint("%s=%$", o->name, str);

 		break;

 	case Tvec:

 		n = optgetvec(p, opt, vec, sizeof vec);

--- a/sys/src/cmd/ip/ipconfig/ipconfig.h

+++ b/sys/src/cmd/ip/ipconfig/ipconfig.h

@@ -149,6 +149,9 @@

 #define DEBUG if(debug)warning

 #pragma	varargck argpos	warning 1

+/* for ndbvalfmt */

+#pragma varargck type "$" char*

+

 /*

  * DHCP

  */

--- a/sys/src/cmd/ip/ipconfig/main.c

+++ b/sys/src/cmd/ip/ipconfig/main.c

@@ -52,8 +52,6 @@

 static int	Ufmt(Fmt*);

 #pragma varargck type "U" char*

-/* for ndbvalfmt */

-#pragma varargck type "$" char*

 void

 usage(void)

@@ -768,7 +766,7 @@

 	if(doadd){

 		if(ipnet != nil && validip(conf.raddr)){

-			p = seprint(p, e, "ipnet=%s ip=%I ipmask=%M ipgw=%I\n",

+			p = seprint(p, e, "ipnet=%$ ip=%I ipmask=%M ipgw=%I\n",

 				ipnet, conf.raddr, conf.mask, conf.gaddr);

 		}

 		if(validip(conf.laddr)){

-- 

⑨