* Eliminated un-needed #ifdef HAVE_UNAME lines

svn: 555

src/chanprog.c

@@ -16,9 +16,7 @@
 #include <sys/rusage.h>
 #endif
 #endif
-#ifdef HAVE_UNAME
 #include <sys/utsname.h>
-#endif
 #include "modules.h"
 
 extern struct userrec	*userlist;
@@ -300,19 +298,15 @@ void tell_verbose_status(int idx)
   clock_t cl;
 # endif
 #endif /* HAVE_GETRUSAGE */
-#ifdef HAVE_UNAME
   struct utsname un;
 
   if (!uname(&un) < 0) {
-#endif /* HAVE_UNAME */
     vers_t = " ";
     uni_t = "*unknown*";
-#ifdef HAVE_UNAME
   } else {
     vers_t = un.release;
     uni_t = un.sysname;
   }
-#endif /* HAVE_UNAME */
 
 #ifdef HUB
   i = count_users(userlist);

src/cmds.c

@@ -14,10 +14,7 @@
 #include <stdlib.h>
 #include <pwd.h>
 #include <sys/types.h>
-       
-#ifdef HAVE_UNAME
 #include <sys/utsname.h>
-#endif
 
 extern struct chanset_t	 *chanset;
 extern struct dcc_t	 *dcc;
@@ -3539,19 +3536,13 @@ static void cmd_botversion(struct userrec * u, int idx, char * par) {
 
 void rcmd_ver(char * fbot, char * fhand, char * fidx) {
   char tmp[2048];
-#ifdef HAVE_UNAME
   struct utsname un;
-#endif /* HAVE_UNAME */
   sprintf(tmp, STR("%s "), version);
-#ifdef HAVE_UNAME
   if (uname(&un) < 0) {
-#endif /* HAVE_UNAME */
     strcat(tmp, STR("(unknown OS)"));
-#ifdef HAVE_UNAME
   } else {
     sprintf(tmp + strlen(tmp), STR("%s %s (%s)"), un.sysname, un.release, un.machine);
   }
-#endif /* HAVE_UNAME */
   botnet_send_cmdreply(botnetnick, fbot, fhand, fidx, tmp);
 }
 

src/dcc.c

@@ -13,13 +13,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-
-#ifdef HAVE_UNAME
 #include <sys/utsname.h>
-#endif
-
-#include "tandem.h"
 #include <sys/stat.h>
+#include "tandem.h"
 
 
 extern struct userrec	*userlist;
@@ -217,9 +213,7 @@ static void greet_new_bot(int idx)
 {
   int i;
   char *sysname = NULL;
-#ifdef HAVE_UNAME
   struct utsname un;
-#endif /* HAVE_UNAME */
 
   dcc[idx].timeval = now;
   dcc[idx].u.bot->version[0] = 0;
@@ -240,12 +234,11 @@ static void greet_new_bot(int idx)
   if (bot_hublevel(dcc[idx].user) == 999)
    dcc[idx].status |= STAT_LEAF;
   dcc[idx].status |= STAT_LINKING;
-#ifdef HAVE_UNAME
+
   if (uname(&un) < 0)
     sysname = "*";
   else
     sysname = un.sysname;
-#endif /* HAVE_UNAME */
 
   dprintf(idx, "v %d %d %s <%s>\n", egg_numver, HANDLEN, ver, network);
   dprintf(idx, "vs %s\n", sysname);

src/main.c

@@ -17,10 +17,7 @@
 #include <netdb.h>
 #include <setjmp.h>
 #include <unistd.h>
-
-#ifdef HAVE_UNAME
 #include <sys/utsname.h>
-#endif
 
 #ifdef STOP_UAC				/* osf/1 complains a lot */
 #include <sys/sysinfo.h>
@@ -1378,14 +1375,11 @@ char *my_uname()
 {
   static char os_uname[250];
   char *unix_n, *vers_n;
-#ifdef HAVE_UNAME
   struct utsname un;
 
     if (uname(&un) < 0) {
-#endif /* HAVE_UNAME */
       unix_n = "*unkown*";
       vers_n = "";
-#ifdef HAVE_UNAME
     } else {
       unix_n = un.nodename;
 #ifdef __FreeBSD__
@@ -1394,7 +1388,6 @@ char *my_uname()
       vers_n = un.version;
 #endif /* __FreeBSD__ */
     }
-#endif /* HAVE_UNAME */
   egg_snprintf(os_uname, sizeof os_uname, "%s %s", unix_n, vers_n);
   return os_uname;
 }

src/misc.c

@@ -23,16 +23,11 @@
 #include <sys/ptrace.h>
 #include <sys/wait.h>
 #endif /* S_ANTITRACE */
-
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <signal.h>
-
-
-#ifdef HAVE_UNAME
-#  include <sys/utsname.h>
-#endif /* HAVE_UNAME */
+#include <sys/utaname.h>
 #include "stat.h"
 #include "bg.h"
 

src/mod/ctcp.mod/ctcp.c

@@ -13,9 +13,7 @@
 #include "server.mod/server.h"
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifdef HAVE_UNAME
 #include <sys/utsname.h>
-#endif /* HAVE_UNAME */
 #include <pwd.h>
 #include <ctype.h>
 
@@ -744,9 +742,7 @@ char *ctcp_start(Function * global_funcs)
 {
 #ifdef LEAF
   char *p;
-#ifdef HAVE_UNAME
   struct utsname un;
-#endif /* HAVE_UNAME */
 #endif /* LEAF */
   global = global_funcs;
 
@@ -756,14 +752,12 @@ char *ctcp_start(Function * global_funcs)
     module_undepend(MODULE_NAME);
     return "This module requires server module 1.0 or later.";
   }
-#ifdef HAVE_UNAME
   egg_bzero(&un, sizeof(un));
   if (!uname(&un)) {
     strncpyz(cloak_os, un.sysname, sizeof(cloak_os));
     strncpyz(cloak_osver, un.release, sizeof(cloak_osver));
     strncpyz(cloak_host, un.nodename, sizeof(cloak_host));
   } else {
-#endif /* HAVE_UNAME */
 /* shit, we have to come up with something ourselves.. */
     switch (random() % 2) {
     case 0:
@@ -776,9 +770,7 @@ char *ctcp_start(Function * global_funcs)
       break;
     }
     strcpy(cloak_host, STR("login"));
-#ifdef HAVE_UNAME
   }
-#endif /* HAVE_UNAME */
   if ((p = strchr(cloak_host, '.')))
     *p = 0;
 

src/mod/irc.mod/irc.c

@@ -12,10 +12,6 @@
 #include "server.mod/server.h"
 #undef serv
 #include "channels.mod/channels.h"
-#ifdef HAVE_UNAME
-#include <sys/utsname.h>
-#endif
-
 
 #define OP_BOTS (CFG_OPBOTS.gdata ? atoi(CFG_OPBOTS.gdata) : 1)
 #define IN_BOTS (CFG_INBOTS.gdata ? atoi(CFG_INBOTS.gdata) : 1)

src/tclmisc.c

@@ -8,9 +8,6 @@
 #include "main.h"
 #include "modules.h"
 #include "tandem.h"
-#ifdef HAVE_UNAME
-#include <sys/utsname.h>
-#endif
 
 extern p_tcl_bind_list	 bind_table_list;
 extern tcl_timer_t	*timer, *utimer;