* Some small fixes

svn: 736

build

@@ -199,7 +199,7 @@ if [ $nopkg = "0" ]; then
   #This MALLOC business is to not Abort 'tar' due to some bug it has.
   tmp=${MALLOC_CHECK_}
   unset MALLOC_CHECK_
-  tar -c${zip}f ${PACKNAME}.$os-$ver${d}.tar.${ext} *.$os.$ver${d}
+  tar -c${zip}f ${PACKNAME}.$os-$ver${d}.tar.${ext} *.$os-$ver${d}
   if test -n "$tmp"; then
     declare -x MALLOC_CHECK_=$tmp
   fi

src/cmds.c

@@ -49,7 +49,6 @@ extern char		 origbotname[], ver[], network[],
 			 owner[], quit_msg[], dcc_prefix[], 
                          botname[], *binname, version[], egg_version[];
 extern time_t		 now, online_since, buildts;
-extern egg_timeval_t egg_timeval_now;
 extern module_entry	*module_list;
 extern struct cfg_entry	CFG_MOTD, **cfg;
 extern tand_t		*tandbot;
@@ -3556,11 +3555,13 @@ void rcmd_msg(char * tobot, char * frombot, char * fromhand, char * fromidx, cha
 /* netlag */
 static void cmd_netlag(struct userrec * u, int idx, char * par) {
   time_t tm;
+  egg_timeval_t tv;
   char tmp[64] = "";
 
   putlog(LOG_CMDS, "*", STR("#%s# netlag"), dcc[idx].nick);
   
-  tm = (egg_timeval_now.sec % 10000) * 100 + (egg_timeval_now.usec * 100) / (1000000);
+  timer_get_now(&tv);
+  tm = (tv.sec % 10000) * 100 + (tv.usec * 100) / (1000000);
   sprintf(tmp, STR("ping %lu"), tm);
   dprintf(idx, STR("Sent ping to all linked bots\n"));
   botnet_send_cmd_broad(-1, conf.bot->nick, u->handle, idx, tmp);
@@ -3579,8 +3580,10 @@ void rcmd_pong(char *frombot, char *fromhand, char *fromidx, char *par) {
 
   if ((i >= 0) && (i < dcc_total) && (dcc[i].type == &DCC_CHAT) && (!strcmp(dcc[i].nick, fromhand))) {
     time_t tm;
+    egg_timeval_t tv;
 
-    tm = ((egg_timeval_now.sec % 10000) * 100 + (egg_timeval_now.usec * 100) / (1000000)) - atoi(par);
+    timer_get_now(&tv);
+    tm = ((tv.sec % 10000) * 100 + (tv.usec * 100) / (1000000)) - atoi(par);
     dprintf(i, STR("Pong from %s: %i.%i seconds\n"), frombot, (tm / 100), (tm % 100));
   }
 }

src/main.c

@@ -100,7 +100,6 @@ int	use_stderr = 1;		/* Send stuff to stderr instead of logfiles? */
 int	do_restart = 0;		/* .restart has been called, restart asap */
 char	quit_msg[1024];		/* quit message */
 time_t	now;			/* duh, now :) */
-egg_timeval_t egg_timeval_now;	/* Same thing, but seconds and microseconds. */
 
 extern struct cfg_entry CFG_FORKINTERVAL;
 
@@ -530,7 +529,7 @@ static void event_resettraffic()
 	egg_memset(&traffic.in_today, 0, sizeof(traffic.in_today));
 }
 
-static void init_main() {
+static void startup_checks() {
   char cfile[DIRMAX] = "";
 
 #ifdef HUB
@@ -662,7 +661,7 @@ int init_dcc_max(), init_userent(), init_auth(), init_config(), init_bots(),
 
 int main(int argc, char **argv)
 {
-  egg_timeval_t howlong;
+  egg_timeval_t howlong, egg_timeval_now;	
 
 #ifdef STOP_UAC
   {
@@ -728,7 +727,7 @@ int main(int argc, char **argv)
   if (checktrace)
     check_trace_start();
 
-  init_main();
+  startup_checks();
 
   /* if we are here, then all the necesary files/dirs are accesable, lets load the config now. */