[BusyBox-cvs] busybox/networking inetd.c,1.1,1.2
Glenn McGrath
bug1 at busybox.net
Mon Feb 10 22:31:12 UTC 2003
Update of /var/cvs/busybox/networking
In directory winder:/tmp/cvs-serv17267/networking
Modified Files:
inetd.c
Log Message:
Fix compile error, last_patch82 by Vladimir N. Oleynik
Index: inetd.c
===================================================================
RCS file: /var/cvs/busybox/networking/inetd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inetd.c 9 Feb 2003 06:51:14 -0000 1.1
+++ inetd.c 10 Feb 2003 22:31:09 -0000 1.2
@@ -156,6 +156,24 @@
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 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 @@
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;
}
More information about the busybox-cvs
mailing list