X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Flibiproute%2Fll_addr.c;h=ab5a2c522c46035a39371376bf705a1324ac1409;hb=7b72fc12000c878e11d5f0b245f83c0d71b29f58;hp=ada685f4eba9750412aecf6d7f5831ce91782b23;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index ada685f4e..ab5a2c522 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_addr.c
  *
@@ -9,11 +10,12 @@
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <arpa/inet.h>
-#include <string.h>
 #include <net/if_arp.h>
-#include "utils.h"
+
 #include "libbb.h"
+#include "rt_names.h"
+#include "utils.h"
+
 
 const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
 {
@@ -27,7 +29,7 @@ const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int
 	l = 0;
 	for (i=0; i<alen; i++) {
 		if (i==0) {
-			snprintf(buf+l, blen, "%02x", addr[i]);
+			snprintf(buf+l, blen, ":%02x"+1, addr[i]);
 			blen -= 2;
 			l += 2;
 		} else {
@@ -44,7 +46,7 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 	if (strchr(arg, '.')) {
 		inet_prefix pfx;
 		if (get_addr_1(&pfx, arg, AF_INET)) {
-			bb_error_msg("\"%s\" is invalid lladdr.", arg);
+			bb_error_msg("\"%s\" is invalid lladdr", arg);
 			return -1;
 		}
 		if (len < 4) {
@@ -63,11 +65,11 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 				cp++;
 			}
 			if (sscanf(arg, "%x", &temp) != 1) {
-				bb_error_msg("\"%s\" is invalid lladdr.", arg);
+				bb_error_msg("\"%s\" is invalid lladdr", arg);
 				return -1;
 			}
 			if (temp < 0 || temp > 255) {
-				bb_error_msg("\"%s\" is invalid lladdr.", arg);
+				bb_error_msg("\"%s\" is invalid lladdr", arg);
 				return -1;
 			}
 			lladdr[i] = temp;