BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply post 1.12.3 fixes, bump to 1.12.4

1_12_stable 1_12_4
Denis Vlasenko 2008-12-31 03:36:02 +00:00
parent 9343da45d3
commit 9b8f810d38
4 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 12
SUBLEVEL = 3
SUBLEVEL = 4
EXTRAVERSION =
NAME = Unnamed

9
coreutils/printf.c
View File

@ -359,8 +359,15 @@ int printf_main(int argc UNUSED_PARAM, char **argv)
* We will mimic coreutils. */
if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
argv++;
if (!argv[1])
if (!argv[1]) {
if (ENABLE_ASH_BUILTIN_PRINTF
&& applet_name[0] != 'p'
) {
bb_error_msg("usage: printf FORMAT [ARGUMENT...]");
return 2; /* bash compat */
}
bb_show_usage();
}
format = argv[1];
argv2 = argv + 2;

2
networking/ip.c
View File

@ -31,7 +31,7 @@ static int NORETURN ip_print_help(char **argv UNUSED_PARAM)
static int ip_do(int (*ip_func)(char **argv), char **argv)
{
argv = ip_parse_common_args(argv);
argv = ip_parse_common_args(argv + 1);
return ip_func(argv);
}

45
networking/libiproute/iptunnel.c
View File

@ -6,7 +6,6 @@
*
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
*
*
* Changes:
*
* Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
@ -18,10 +17,52 @@
#include <net/if.h>
#include <net/if_arp.h>
#include <asm/types.h>
#ifndef __constant_htons
#define __constant_htons htons
#endif
#include <linux/if_tunnel.h>
// FYI: #define SIOCDEVPRIVATE 0x89F0
/* From linux/if_tunnel.h. #including it proved troublesome
* (redefiniton errors due to name collisions in linux/ and net[inet]/) */
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
#define SIOCDELTUNNEL (SIOCDEVPRIVATE + 2)
#define SIOCCHGTUNNEL (SIOCDEVPRIVATE + 3)
//#define SIOCGETPRL (SIOCDEVPRIVATE + 4)
//#define SIOCADDPRL (SIOCDEVPRIVATE + 5)
//#define SIOCDELPRL (SIOCDEVPRIVATE + 6)
//#define SIOCCHGPRL (SIOCDEVPRIVATE + 7)
#define GRE_CSUM __constant_htons(0x8000)
//#define GRE_ROUTING __constant_htons(0x4000)
#define GRE_KEY __constant_htons(0x2000)
#define GRE_SEQ __constant_htons(0x1000)
//#define GRE_STRICT __constant_htons(0x0800)
//#define GRE_REC __constant_htons(0x0700)
//#define GRE_FLAGS __constant_htons(0x00F8)
//#define GRE_VERSION __constant_htons(0x0007)
struct ip_tunnel_parm {
char name[IFNAMSIZ];
int link;
uint16_t i_flags;
uint16_t o_flags;
uint32_t i_key;
uint32_t o_key;
struct iphdr iph;
};
/* SIT-mode i_flags */
//#define SIT_ISATAP 0x0001
//struct ip_tunnel_prl {
// uint32_t addr;
// uint16_t flags;
// uint16_t __reserved;
// uint32_t datalen;
// uint32_t __reserved2;
// /* data follows */
//};
///* PRL flags */
//#define PRL_DEFAULT 0x0001
#include "ip_common.h" /* #include "libbb.h" is inside */
#include "rt_names.h"