diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/e_engine.c | 7 | ||||
| -rw-r--r-- | src/engine/e_system.c | 18 |
2 files changed, 15 insertions, 10 deletions
diff --git a/src/engine/e_engine.c b/src/engine/e_engine.c index 341bf936..998621e8 100644 --- a/src/engine/e_engine.c +++ b/src/engine/e_engine.c @@ -37,6 +37,7 @@ void engine_init(const char *appname, int argc, char **argv) /* load the configuration */ { int i; + int abs = 0; const char *config_filename = "default.cfg"; char buf[1024]; for(i = 1; i < argc; i++) @@ -44,11 +45,15 @@ void engine_init(const char *appname, int argc, char **argv) if(argv[i][0] == '-' && argv[i][1] == 'f' && argv[i][2] == 0 && argc - i > 1) { config_filename = argv[i+1]; + abs = 1; i++; } } - config_load(engine_savepath(config_filename, buf, sizeof(buf))); + if(abs) + config_load(config_filename); + else + config_load(engine_savepath(config_filename, buf, sizeof(buf))); } /* search arguments for overrides */ diff --git a/src/engine/e_system.c b/src/engine/e_system.c index 90aeccc5..08a6dfa1 100644 --- a/src/engine/e_system.c +++ b/src/engine/e_system.c @@ -417,7 +417,7 @@ int net_host_lookup(const char *hostname, unsigned short port, NETADDR4 *addr) NETSOCKET net_udp4_create(NETADDR4 bindaddr) { struct sockaddr addr; - unsigned int mode = 1; + unsigned long mode = 1; int broadcast = 1; /* create socket */ @@ -435,9 +435,9 @@ NETSOCKET net_udp4_create(NETADDR4 bindaddr) /* set non-blocking */ #if defined(CONF_FAMILY_WINDOWS) - ioctlsocket(sock, FIONBIO, (unsigned long *)&mode); + ioctlsocket(sock, FIONBIO, mode); #else - ioctl(sock, FIONBIO, (unsigned long *)&mode); + ioctl(sock, FIONBIO, mode); #endif /* set boardcast */ @@ -504,21 +504,21 @@ NETSOCKET net_tcp4_create(const NETADDR4 *a) int net_tcp4_set_non_blocking(NETSOCKET sock) { - unsigned int mode = 1; + unsigned long mode = 1; #if defined(CONF_FAMILY_WINDOWS) - return ioctlsocket(sock, FIONBIO, (unsigned long *)&mode); + return ioctlsocket(sock, FIONBIO, mode); #else - return ioctl(sock, FIONBIO, (unsigned long *)&mode); + return ioctl(sock, FIONBIO, mode); #endif } int net_tcp4_set_blocking(NETSOCKET sock) { - unsigned int mode = 0; + unsigned long mode = 0; #if defined(CONF_FAMILY_WINDOWS) - return ioctlsocket(sock, FIONBIO, (unsigned long *)&mode); + return ioctlsocket(sock, FIONBIO, mode); #else - return ioctl(sock, FIONBIO, (unsigned long *)&mode); + return ioctl(sock, FIONBIO, mode); #endif } |