emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vconfig: fix bug 701 (I be damned if I understand it)

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-30 19:37:25 +00:00
parent 02be0f5350
commit 3038ac9c19
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archival/libunarchive/decompress_unzip.c
View File

@ -806,11 +806,11 @@ static int inflate_get_next_window(void)
} }
switch (method) { switch (method) {
case -1: ret = inflate_stored(0,0,0,0); case -1: ret = inflate_stored(0,0,0,0);
break; break;
case -2: ret = inflate_codes(0,0,0,0,0); case -2: ret = inflate_codes(0,0,0,0,0);
break; break;
default: bb_error_msg_and_die("inflate error %d", method); default: bb_error_msg_and_die("inflate error %d", method);
} }
if (ret == 1) { if (ret == 1) {
@ -911,7 +911,7 @@ int inflate_gunzip(int in, int out)
if (gunzip_bytes_out != if (gunzip_bytes_out !=
(bytebuffer[bytebuffer_offset] | (bytebuffer[bytebuffer_offset+1] << 8) | (bytebuffer[bytebuffer_offset] | (bytebuffer[bytebuffer_offset+1] << 8) |
(bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) { (bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) {
bb_error_msg("Incorrect length"); bb_error_msg("incorrect length");
return -1; return -1;
} }

5
networking/vconfig.c
View File

@ -72,7 +72,7 @@ static const char cmds[] = {
's', 'e', 't', '_', 's', 'e', 't', '_',
'n', 'a', 'm', 'e', '_', 'n', 'a', 'm', 'e', '_',
't', 'y', 'p', 'e', 0, 't', 'y', 'p', 'e', 0,
4, SET_VLAN_FLAG_CMD, 12, 5, SET_VLAN_FLAG_CMD, 12,
's', 'e', 't', '_', 's', 'e', 't', '_',
'f', 'l', 'a', 'g', 0, 'f', 'l', 'a', 'g', 0,
5, SET_VLAN_EGRESS_PRIORITY_CMD, 18, 5, SET_VLAN_EGRESS_PRIORITY_CMD, 18,
@ -145,6 +145,8 @@ int vconfig_main(int argc, char **argv)
* more of a pain. */ * more of a pain. */
if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */ if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */
ifr.u.flag = bb_xgetularg10_bnd(p, 0, 1); ifr.u.flag = bb_xgetularg10_bnd(p, 0, 1);
/* DM: in order to set reorder header, qos must be set */
ifr.vlan_qos = bb_xgetularg10_bnd(argv[3], 0, 7);
} else if (ifr.cmd == ADD_VLAN_CMD) { /* add */ } else if (ifr.cmd == ADD_VLAN_CMD) { /* add */
ifr.u.VID = bb_xgetularg10_bnd(p, 0, VLAN_GROUP_ARRAY_LEN-1); ifr.u.VID = bb_xgetularg10_bnd(p, 0, VLAN_GROUP_ARRAY_LEN-1);
} else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */ } else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */
@ -160,4 +162,3 @@ int vconfig_main(int argc, char **argv)
return 0; return 0;
} }