9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unneeded includes from newconf.h

Browse source
This commit is contained in:
Valery Yatsko 2008-07-28 23:14:51 +04:00
parent 6fce54ff82
commit adc7be98fc
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/newconf.h
View file

@ -6,12 +6,6 @@
#ifndef _NEWCONF_H_INCLUDED #ifndef _NEWCONF_H_INCLUDED
#define _NEWCONF_H_INCLUDED #define _NEWCONF_H_INCLUDED
#include <sys/types.h>
#include <stdio.h>
#include "client.h"
struct ConfEntry struct ConfEntry
{ {
const char *cf_name; const char *cf_name;

24
src/ircd.c
View file

@ -541,6 +541,19 @@ main(int argc, char *argv[])
return -1; return -1;
} }
init_sys();
myargv = argv;
parseargs(&argc, &argv, myopts);
if(chdir(ConfigFileEntry.dpath))
{
fprintf(stderr, "Unable to chdir to %s: %s\n", ConfigFileEntry.dpath, strerror(errno));
exit(EXIT_FAILURE);
}
rb_set_time(); rb_set_time();
/* /*
@ -577,10 +590,10 @@ main(int argc, char *argv[])
ConfigFileEntry.xlinefile = XPATH; ConfigFileEntry.xlinefile = XPATH;
ConfigFileEntry.resvfile = RESVPATH; ConfigFileEntry.resvfile = RESVPATH;
ConfigFileEntry.connect_timeout = 30; /* Default to 30 */ ConfigFileEntry.connect_timeout = 30; /* Default to 30 */
myargv = argv;
umask(077); /* better safe than sorry --SRB */ umask(077); /* better safe than sorry --SRB */
parseargs(&argc, &argv, myopts);
if(printVersion) if(printVersion)
{ {
@ -588,11 +601,7 @@ main(int argc, char *argv[])
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
if(chdir(ConfigFileEntry.dpath))
{
fprintf(stderr, "Unable to chdir to %s: %s\n", ConfigFileEntry.dpath, strerror(errno));
exit(EXIT_FAILURE);
}
setup_signals(); setup_signals();
@ -620,7 +629,6 @@ main(int argc, char *argv[])
} }
/* Init the event subsystem */ /* Init the event subsystem */
init_sys();
rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE); rb_lib_init(ircd_log_cb, ircd_restart_cb, ircd_die_cb, !server_state_foreground, maxconnections, DNODE_HEAP_SIZE, FD_HEAP_SIZE);
rb_linebuf_init(LINEBUF_HEAP_SIZE); rb_linebuf_init(LINEBUF_HEAP_SIZE);