3038ac9c1
Denis Vlasenko
2006-09-30
Subject
vconfig: fix bug 701 (I be damned if I understand it)
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/libunarchive/decompress_unzip.c+6 -6
| @@ -806,11 +806,11 @@ static int inflate_get_next_window(void) | |
| } | |
| switch (method) { | |
| - | case -1: ret = inflate_stored(0,0,0,0); |
| - | break; |
| - | case -2: ret = inflate_codes(0,0,0,0,0); |
| - | break; |
| - | default: bb_error_msg_and_die("inflate error %d", method); |
| + | case -1: ret = inflate_stored(0,0,0,0); |
| + | break; |
| + | case -2: ret = inflate_codes(0,0,0,0,0); |
| + | break; |
| + | default: bb_error_msg_and_die("inflate error %d", method); |
| } | |
| if (ret == 1) { | |
| @@ -911,7 +911,7 @@ int inflate_gunzip(int in, int out) | |
| if (gunzip_bytes_out != | |
| (bytebuffer[bytebuffer_offset] | (bytebuffer[bytebuffer_offset+1] << 8) | | |
| (bytebuffer[bytebuffer_offset+2] << 16) | (bytebuffer[bytebuffer_offset+3] << 24))) { | |
| - | bb_error_msg("Incorrect length"); |
| + | bb_error_msg("incorrect length"); |
| return -1; | |
| } | |
networking/vconfig.c+3 -2
| @@ -72,7 +72,7 @@ static const char cmds[] = { | |
| 's', 'e', 't', '_', | |
| 'n', 'a', 'm', 'e', '_', | |
| 't', 'y', 'p', 'e', 0, | |
| - | 4, SET_VLAN_FLAG_CMD, 12, |
| + | 5, SET_VLAN_FLAG_CMD, 12, |
| 's', 'e', 't', '_', | |
| 'f', 'l', 'a', 'g', 0, | |
| 5, SET_VLAN_EGRESS_PRIORITY_CMD, 18, | |
| @@ -145,6 +145,8 @@ int vconfig_main(int argc, char **argv) | |
| * more of a pain. */ | |
| if (ifr.cmd == SET_VLAN_FLAG_CMD) { /* set_flag */ | |
| 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 */ | |
| ifr.u.VID = bb_xgetularg10_bnd(p, 0, VLAN_GROUP_ARRAY_LEN-1); | |
| } else if (ifr.cmd != DEL_VLAN_CMD) { /* set_{egress|ingress}_map */ | |
| @@ -160,4 +162,3 @@ int vconfig_main(int argc, char **argv) | |
| return 0; | |
| } | |
| - | |