more tweak for bionic
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
acff3733ba
commit
14bd16ac56
@ -693,10 +693,12 @@ static bool diff(FILE* fp[2], char *file[2])
|
||||
|
||||
static int diffreg(char *file[2])
|
||||
{
|
||||
FILE *fp[2] = { stdin, stdin };
|
||||
FILE *fp[2];
|
||||
bool binary = false, differ = false;
|
||||
int status = STATUS_SAME, i;
|
||||
|
||||
fp[0] = stdin;
|
||||
fp[1] = stdin;
|
||||
for (i = 0; i < 2; i++) {
|
||||
int fd = open_or_warn_stdin(file[i]);
|
||||
if (fd == -1)
|
||||
|
@ -266,6 +266,7 @@ typedef unsigned smalluint;
|
||||
#if defined __GLIBC__ \
|
||||
|| defined __UCLIBC__ \
|
||||
|| defined __dietlibc__ \
|
||||
|| defined __BIONIC__ \
|
||||
|| defined _NEWLIB_VERSION
|
||||
# include <features.h>
|
||||
#endif
|
||||
@ -492,7 +493,8 @@ extern int vasprintf(char **string_ptr, const char *format, va_list p) FAST_FUNC
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETLINE
|
||||
#include <stdio.h> /* for FILE */
|
||||
# include <stdio.h> /* for FILE */
|
||||
# include <sys/types.h> /* size_t */
|
||||
extern ssize_t getline(char **lineptr, size_t *n, FILE *stream) FAST_FUNC;
|
||||
#endif
|
||||
|
||||
|
@ -29,6 +29,22 @@
|
||||
#include <netinet/ip_icmp.h>
|
||||
#include "libbb.h"
|
||||
|
||||
#ifdef __BIONIC__
|
||||
/* should be in netinet/ip_icmp.h */
|
||||
# define ICMP_DEST_UNREACH 3 /* Destination Unreachable */
|
||||
# define ICMP_SOURCE_QUENCH 4 /* Source Quench */
|
||||
# define ICMP_REDIRECT 5 /* Redirect (change route) */
|
||||
# define ICMP_ECHO 8 /* Echo Request */
|
||||
# define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */
|
||||
# define ICMP_PARAMETERPROB 12 /* Parameter Problem */
|
||||
# define ICMP_TIMESTAMP 13 /* Timestamp Request */
|
||||
# define ICMP_TIMESTAMPREPLY 14 /* Timestamp Reply */
|
||||
# define ICMP_INFO_REQUEST 15 /* Information Request */
|
||||
# define ICMP_INFO_REPLY 16 /* Information Reply */
|
||||
# define ICMP_ADDRESS 17 /* Address Mask Request */
|
||||
# define ICMP_ADDRESSREPLY 18 /* Address Mask Reply */
|
||||
#endif
|
||||
|
||||
//config:config PING
|
||||
//config: bool "ping"
|
||||
//config: default y
|
||||
|
@ -40,10 +40,25 @@
|
||||
#include <netinet/in.h>
|
||||
#include "libbb.h"
|
||||
|
||||
#ifdef __BIONIC__
|
||||
/* should be in arpa/telnet.h */
|
||||
# define IAC 255 /* interpret as command: */
|
||||
# define DONT 254 /* you are not to use option */
|
||||
# define DO 253 /* please, you use option */
|
||||
# define WONT 252 /* I won't use option */
|
||||
# define WILL 251 /* I will use option */
|
||||
# define SB 250 /* interpret as subnegotiation */
|
||||
# define SE 240 /* end sub negotiation */
|
||||
# define TELOPT_ECHO 1 /* echo */
|
||||
# define TELOPT_SGA 3 /* suppress go ahead */
|
||||
# define TELOPT_TTYPE 24 /* terminal type */
|
||||
# define TELOPT_NAWS 31 /* window size */
|
||||
#endif
|
||||
|
||||
#ifdef DOTRACE
|
||||
#define TRACE(x, y) do { if (x) printf y; } while (0)
|
||||
# define TRACE(x, y) do { if (x) printf y; } while (0)
|
||||
#else
|
||||
#define TRACE(x, y)
|
||||
# define TRACE(x, y)
|
||||
#endif
|
||||
|
||||
enum {
|
||||
|
@ -33,6 +33,25 @@
|
||||
#include <syslog.h>
|
||||
#include <linux/input.h>
|
||||
|
||||
#ifndef EV_SW
|
||||
# define EV_SW 0x05
|
||||
#endif
|
||||
#ifndef EV_KEY
|
||||
# define EV_KEY 0x01
|
||||
#endif
|
||||
#ifndef SW_LID
|
||||
# define SW_LID 0x00
|
||||
#endif
|
||||
#ifndef SW_RFKILL_ALL
|
||||
# define SW_RFKILL_ALL 0x03
|
||||
#endif
|
||||
#ifndef KEY_POWER
|
||||
# define KEY_POWER 116 /* SC System Power Down */
|
||||
#endif
|
||||
#ifndef KEY_SLEEP
|
||||
# define KEY_SLEEP 142 /* SC System Sleep */
|
||||
#endif
|
||||
|
||||
enum {
|
||||
OPT_c = (1 << 0),
|
||||
OPT_d = (1 << 1),
|
||||
|
@ -25,6 +25,9 @@
|
||||
#include "libbb.h"
|
||||
#include <mntent.h>
|
||||
#include <sys/swap.h>
|
||||
#ifndef __BIONIC__
|
||||
# include <sys/swap.h>
|
||||
#endif
|
||||
|
||||
#if ENABLE_FEATURE_MOUNT_LABEL
|
||||
# include "volume_id.h"
|
||||
@ -32,6 +35,10 @@
|
||||
# define resolve_mount_spec(fsname) ((void)0)
|
||||
#endif
|
||||
|
||||
#ifndef MNTTYPE_SWAP
|
||||
# define MNTTYPE_SWAP "swap"
|
||||
#endif
|
||||
|
||||
#if ENABLE_FEATURE_SWAPON_PRI
|
||||
struct globals {
|
||||
int flags;
|
||||
|
Loading…
Reference in New Issue
Block a user