X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fisrv_identd.c;h=e8ba007667255e51519062dc208a60355f551be5;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=9bc3b607d15e15ad8f17654de51cf13e318fc847;hpb=d37f22225b4d10b84bbc4f6cee2e26d9f9b80fac;p=oweals%2Fbusybox.git

diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 9bc3b607d..e8ba00766 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -2,13 +2,13 @@
 /*
  * Fake identd server.
  *
- * Copyright (C) 2007 Denis Vlasenko
+ * Copyright (C) 2007 Denys Vlasenko
  *
  * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
-#include <syslog.h>
 #include "libbb.h"
+#include <syslog.h>
 #include "isrv.h"
 
 enum { TIMEOUT = 20 };
@@ -61,7 +61,7 @@ static int do_rd(int fd, void **paramp)
 	p = strpbrk(cur, "\r\n");
 	if (p)
 		*p = '\0';
-	if (!p && sz && buf->pos <= sizeof(buf->buf))
+	if (!p && sz && buf->pos <= (int)sizeof(buf->buf))
 		goto ok;
 	/* Terminate session. If we are in server mode, then
 	 * fd is still in nonblocking mode - we never block here */
@@ -76,7 +76,7 @@ static int do_rd(int fd, void **paramp)
 	return retval;
 }
 
-static int do_timeout(void **paramp)
+static int do_timeout(void **paramp UNUSED_PARAM)
 {
 	return 1; /* terminate session */
 }
@@ -92,8 +92,8 @@ static void inetd_mode(void)
 	while (do_rd(0, (void*)&buf) == 0);
 }
 
-int fakeidentd_main(int argc, char **argv);
-int fakeidentd_main(int argc, char **argv)
+int fakeidentd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
 {
 	enum {
 		OPT_foreground = 0x1,
@@ -113,7 +113,7 @@ int fakeidentd_main(int argc, char **argv)
 		strncpy(bogouser, argv[optind], sizeof(bogouser));
 
 	/* Daemonize if no -f and no -i and no -w */
-	if (!(opt & OPT_fiw));
+	if (!(opt & OPT_fiw))
 		bb_daemonize_or_rexec(0, argv);
 
 	/* Where to log in inetd modes? "Classic" inetd
@@ -122,7 +122,7 @@ int fakeidentd_main(int argc, char **argv)
 	 * log to stderr. I like daemontools more. Go their way.
 	 * (Or maybe we need yet another option "log to syslog") */
 	if (!(opt & OPT_fiw) /* || (opt & OPT_syslog) */) {
-		openlog(applet_name, 0, LOG_DAEMON);
+		openlog(applet_name, LOG_PID, LOG_DAEMON);
 		logmode = LOGMODE_SYSLOG;
 	}