neozeed ircu2.9.32-linux-hacks.diff

ircd/ircd.c

@@ -52,7 +52,7 @@ char	*configfile = CONFIGFILE;	/* Server configuration file */
 int	debuglevel = -1;		/* Server debug level */
 int	bootopt = 0;			/* Server boot option flags */
 char	*debugmode = "";		/*  -"-    -"-   -"-  */
-char	*sbrk0;				/* initial sbrk(0) */
+void	*sbrk0;				/* initial sbrk(0) */
 int	dorehash = 0;
 static	char	*dpath = DPATH;
 
@@ -434,7 +434,7 @@ char	*argv[];
 	struct  rlimit corelim;
 #endif
 
-	sbrk0 = (char *)sbrk((size_t)0);
+	sbrk0 = sbrk(0);
 	uid = getuid();
 	euid = geteuid();
 	now = time(NULL);
@@ -482,7 +482,7 @@ char	*argv[];
 		char	*p = argv[0]+1;
 		int	flag = *p++;
 
-		if (flag == '\0' || *p == '\0')
+		if (flag == '\0' || *p == '\0') {
 			if (argc > 1 && argv[1][0] != '-')
 			    {
 				p = *++argv;
@@ -490,6 +490,7 @@ char	*argv[];
 			    }
 			else
 				p = "";
+		}
 
 		switch (flag)
 		    {
@@ -797,8 +798,8 @@ static	void	open_debugfile()
 		local[2] = cptr;
 		(void)strcpy(cptr->sockhost, me.sockhost);
 
-		(void)printf("isatty = %d ttyname = %#x\n",
-			isatty(2), (u_int)ttyname(2));
+		(void)printf("isatty = %d ttyname = 0x%p\n",
+			isatty(2), ttyname(2));
 		if (!(bootopt & BOOT_TTY)) /* leave debugging output on fd 2 */
 		    {
 			(void)truncate(LOGFILE, 0);