summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2003-02-10 22:31:09 +0000
committerGlenn L McGrath2003-02-10 22:31:09 +0000
commitb1207b33206a52f733067850be79931373632e39 (patch)
treeec9d7e56e8a5b2ec11df9512e37a40d5c575ea8a
parent3d2405cfb30ccc8113839c1be3ee265597b857a6 (diff)
downloadbusybox-b1207b33206a52f733067850be79931373632e39.zip
busybox-b1207b33206a52f733067850be79931373632e39.tar.gz
Fix compile error, last_patch82 by Vladimir N. Oleynik
-rw-r--r--networking/inetd.c31
1 files changed, 23 insertions, 8 deletions
diff --git a/networking/inetd.c b/networking/inetd.c
index 047358c..0b80752 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -156,6 +156,24 @@ static int rlim_ofile_cur = OPEN_MAX;
static struct rlimit rlim_ofile;
#endif
+#define INETD_UNSUPPORT_BILTIN 1
+
+/* Check unsupporting builtin */
+#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO
+#undef INETD_UNSUPPORT_BILTIN
+#endif
+#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD
+#undef INETD_UNSUPPORT_BILTIN
+#endif
+#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME
+#undef INETD_UNSUPPORT_BILTIN
+#endif
+#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME
+#undef INETD_UNSUPPORT_BILTIN
+#endif
+#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN
+#undef INETD_UNSUPPORT_BILTIN
+#endif
static struct servtab {
char *se_service; /* name of service */
@@ -197,35 +215,28 @@ static int timingout;
static sigset_t blockmask, emptymask;
-#define INETD_UNSUPPORT_BILTIN 1
-
/* Echo received data */
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO
-#undef INETD_UNSUPPORT_BILTIN
static void echo_stream(int, struct servtab *);
static void echo_dg(int, struct servtab *);
#endif
/* Internet /dev/null */
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD
-#undef INETD_UNSUPPORT_BILTIN
static void discard_stream(int, struct servtab *);
static void discard_dg(int, struct servtab *);
#endif
/* Return 32 bit time since 1900 */
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME
-#undef INETD_UNSUPPORT_BILTIN
static void machtime_stream(int, struct servtab *);
static void machtime_dg(int, struct servtab *);
#endif
/* Return human-readable time */
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME
-#undef INETD_UNSUPPORT_BILTIN
static void daytime_stream(int, struct servtab *);
static void daytime_dg(int, struct servtab *);
#endif
/* Familiar character generator */
#ifdef CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN
-#undef INETD_UNSUPPORT_BILTIN
static void chargen_stream(int, struct servtab *);
static void chargen_dg(int, struct servtab *);
#endif
@@ -536,7 +547,11 @@ bump_nofile(void)
rl.rlim_cur = MIN(rl.rlim_max, rl.rlim_cur + FD_CHUNK);
if (rl.rlim_cur <= rlim_ofile_cur) {
syslog(LOG_ERR,
- "bump_nofile: cannot extend file limit, max = %d",
+#if _FILE_OFFSET_BITS == 64
+ "bump_nofile: cannot extend file limit, max = %lld",
+#else
+ "bump_nofile: cannot extend file limit, max = %ld",
+#endif
rl.rlim_cur);
return -1;
}