git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re: acl trouble after upgrading ubuntu
[safe/jmp/linux-2.6]
/
lib
/
vsprintf.c
diff --git
a/lib/vsprintf.c
b/lib/vsprintf.c
index
73a14b8
..
33bed5e
100644
(file)
--- a/
lib/vsprintf.c
+++ b/
lib/vsprintf.c
@@
-671,7
+671,7
@@
static char *ip4_string(char *p, const u8 *addr, bool leading_zeros)
return p;
}
return p;
}
-static char *ip6_compressed_string(char *p, const
struct in6_add
r *addr)
+static char *ip6_compressed_string(char *p, const
cha
r *addr)
{
int i;
int j;
{
int i;
int j;
@@
-683,7
+683,12
@@
static char *ip6_compressed_string(char *p, const struct in6_addr *addr)
u8 hi;
u8 lo;
bool needcolon = false;
u8 hi;
u8 lo;
bool needcolon = false;
- bool useIPv4 = ipv6_addr_v4mapped(addr) || ipv6_addr_is_isatap(addr);
+ bool useIPv4;
+ struct in6_addr in6;
+
+ memcpy(&in6, addr, sizeof(struct in6_addr));
+
+ useIPv4 = ipv6_addr_v4mapped(&in6) || ipv6_addr_is_isatap(&in6);
memset(zerolength, 0, sizeof(zerolength));
memset(zerolength, 0, sizeof(zerolength));
@@
-695,7
+700,7
@@
static char *ip6_compressed_string(char *p, const struct in6_addr *addr)
/* find position of longest 0 run */
for (i = 0; i < range; i++) {
for (j = i; j < range; j++) {
/* find position of longest 0 run */
for (i = 0; i < range; i++) {
for (j = i; j < range; j++) {
- if (
addr->
s6_addr16[j] != 0)
+ if (
in6.
s6_addr16[j] != 0)
break;
zerolength[i]++;
}
break;
zerolength[i]++;
}
@@
-722,7
+727,7
@@
static char *ip6_compressed_string(char *p, const struct in6_addr *addr)
needcolon = false;
}
/* hex u16 without leading 0s */
needcolon = false;
}
/* hex u16 without leading 0s */
- word = ntohs(
addr->
s6_addr16[i]);
+ word = ntohs(
in6.
s6_addr16[i]);
hi = word >> 8;
lo = word & 0xff;
if (hi) {
hi = word >> 8;
lo = word & 0xff;
if (hi) {
@@
-741,19
+746,19
@@
static char *ip6_compressed_string(char *p, const struct in6_addr *addr)
if (useIPv4) {
if (needcolon)
*p++ = ':';
if (useIPv4) {
if (needcolon)
*p++ = ':';
- p = ip4_string(p, &
addr->
s6_addr[12], false);
+ p = ip4_string(p, &
in6.
s6_addr[12], false);
}
*p = '\0';
return p;
}
}
*p = '\0';
return p;
}
-static char *ip6_string(char *p, const
struct in6_add
r *addr, const char *fmt)
+static char *ip6_string(char *p, const
cha
r *addr, const char *fmt)
{
int i;
for (i = 0; i < 8; i++) {
{
int i;
for (i = 0; i < 8; i++) {
- p = pack_hex_byte(p,
addr->s6_addr[2 * i]
);
- p = pack_hex_byte(p,
addr->s6_addr[2 * i + 1]
);
+ p = pack_hex_byte(p,
*addr++
);
+ p = pack_hex_byte(p,
*addr++
);
if (fmt[0] == 'I' && i != 7)
*p++ = ':';
}
if (fmt[0] == 'I' && i != 7)
*p++ = ':';
}
@@
-768,9
+773,9
@@
static char *ip6_addr_string(char *buf, char *end, const u8 *addr,
char ip6_addr[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")];
if (fmt[0] == 'I' && fmt[2] == 'c')
char ip6_addr[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255")];
if (fmt[0] == 'I' && fmt[2] == 'c')
- ip6_compressed_string(ip6_addr,
(const struct in6_addr *)
addr);
+ ip6_compressed_string(ip6_addr, addr);
else
else
- ip6_string(ip6_addr,
(const struct in6_addr *)
addr, fmt);
+ ip6_string(ip6_addr, addr, fmt);
return string(buf, end, ip6_addr, spec);
}
return string(buf, end, ip6_addr, spec);
}
@@
-1766,7
+1771,7
@@
int vsscanf(const char * buf, const char * fmt, va_list args)
* advance both strings to next white space
*/
if (*fmt == '*') {
* advance both strings to next white space
*/
if (*fmt == '*') {
- while (!isspace(*fmt) && *fmt)
+ while (!isspace(*fmt) && *fmt
!= '%' && *fmt
)
fmt++;
while (!isspace(*str) && *str)
str++;
fmt++;
while (!isspace(*str) && *str)
str++;