summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libbb.h29
-rw-r--r--networking/fakeidentd.c10
-rw-r--r--networking/nameif.c4
3 files changed, 17 insertions, 26 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 4293d39..18ad841 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -25,8 +25,6 @@
#include <sys/types.h>
#include <termios.h>
-
-
#ifdef CONFIG_SELINUX
#include <selinux/selinux.h>
#endif
@@ -40,6 +38,17 @@
# include "sha1.h"
#endif
+/* Try to pull in PATH_MAX */
+#include <limits.h>
+#include <sys/param.h>
+#ifndef PATH_MAX
+#define PATH_MAX 256
+#endif
+
+#ifdef DMALLOC
+#include <dmalloc.h>
+#endif
+
/* Some useful definitions */
#undef FALSE
#define FALSE ((int) 0)
@@ -457,12 +466,11 @@ extern void bb_xread_all(int fd, void *buf, size_t count);
extern unsigned char bb_xread_char(int fd);
#ifndef COMM_LEN
-/*#include <sched.h> *//* Task command name length */
#ifdef TASK_COMM_LEN
#define COMM_LEN TASK_COMM_LEN
#else
-#define COMM_LEN 16 /* synchronize with size of comm in struct task_struct
- in /usr/include/linux/sched.h */
+/* synchronize with sizeof(task_struct.comm) in /usr/include/linux/sched.h */
+#define COMM_LEN 16
#endif
#endif
typedef struct {
@@ -530,17 +538,6 @@ extern uint32_t *bb_crc32_filltable (int endian);
#define RB_POWER_OFF 0x4321fedc
#endif
-/* Try to pull in PATH_MAX */
-#include <limits.h>
-#include <sys/param.h>
-#ifndef PATH_MAX
-#define PATH_MAX 256
-#endif
-
-#ifdef DMALLOC
-#include <dmalloc.h>
-#endif
-
extern const char BB_BANNER[];
#endif /* __LIBBUSYBOX_H__ */
diff --git a/networking/fakeidentd.c b/networking/fakeidentd.c
index d3aa3ce..b097d99 100644
--- a/networking/fakeidentd.c
+++ b/networking/fakeidentd.c
@@ -9,28 +9,22 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
+#include "busybox.h"
+
#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
#include <string.h>
#include <fcntl.h>
#include <signal.h>
#include <sys/syslog.h>
#include <pwd.h>
-#include <netdb.h>
#include <sys/syslog.h>
-#include <sys/types.h>
#include <time.h>
#include <sys/socket.h>
-#include <netinet/in.h>
#include <errno.h>
-#include <arpa/inet.h>
#include <sys/uio.h>
-#include "busybox.h"
#define IDENT_PORT 113
#define MAXCONNS 20
diff --git a/networking/nameif.c b/networking/nameif.c
index 7dc48ec..3d53d6f 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -8,17 +8,17 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
+#include "busybox.h"
+
#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <errno.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <net/if.h>
#include <netinet/ether.h>
-#include "busybox.h"
/* Older versions of net/if.h do not appear to define IF_NAMESIZE. */
#ifndef IF_NAMESIZE