empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(print_usage): New.

Browse source 
(main): Use it.

(main) [_WIN32]: Parse command line arguments.

(main) [_WIN32]:  Switch to Unix style function for access and mkdir.
This commit is contained in:
Ron Koenderink 2004-12-08 13:02:10 +00:00
parent 97113af8ff
commit 2d48dd0859
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/util/files.c
View file

@ -44,6 +44,7 @@
#include <sys/file.h> #include <sys/file.h>
#else #else
#include <direct.h> #include <direct.h>
#include "getopt.h"
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -65,6 +66,13 @@
static void file_sct_init(coord x, coord y, s_char *ptr); static void file_sct_init(coord x, coord y, s_char *ptr);
static void
print_usage(char *program_name)
{
printf("Usage: %s -f -e econfig_file\n", program_name);
printf("-f force mode\n");
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -81,7 +89,6 @@ main(int argc, char *argv[])
char *config_file = NULL; char *config_file = NULL;
int force = 0; int force = 0;
#if !defined(_WIN32)
while ((opt = getopt(argc, argv, "e:f")) != EOF) { while ((opt = getopt(argc, argv, "e:f")) != EOF) {
switch (opt) { switch (opt) {
case 'e': case 'e':
@ -90,9 +97,11 @@ main(int argc, char *argv[])
case 'f': case 'f':
force = 1; force = 1;
break; break;
default:
print_usage(argv[0]);
exit(-1);
} }
} }
#endif
/* Try to use the existing data directory */ /* Try to use the existing data directory */
if (config_file == NULL) { if (config_file == NULL) {
@ -103,11 +112,7 @@ main(int argc, char *argv[])
empfile[EF_MAP].size = (WORLD_X * WORLD_Y) / 2; empfile[EF_MAP].size = (WORLD_X * WORLD_Y) / 2;
empfile[EF_BMAP].size = (WORLD_X * WORLD_Y) / 2; empfile[EF_BMAP].size = (WORLD_X * WORLD_Y) / 2;
#if !defined(_WIN32)
if (access(datadir, F_OK) < 0 && mkdir(datadir, 0750) < 0) { if (access(datadir, F_OK) < 0 && mkdir(datadir, 0750) < 0) {
#else
if (_access(datadir, 06) < 0 && _mkdir(datadir) < 0) {
#endif
perror(datadir); perror(datadir);
printf("Can't make game directory\n"); printf("Can't make game directory\n");
exit(1); exit(1);
@ -148,11 +153,7 @@ main(int argc, char *argv[])
putnat((&nat)); putnat((&nat));
} }
ef_close(EF_NATION); ef_close(EF_NATION);
#if !defined(_WIN32)
if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) { if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) {
#else
if (access(teldir, 06) < 0 && _mkdir(teldir) < 0) {
#endif
perror(teldir); perror(teldir);
printf("Can't make telegram directory\n"); printf("Can't make telegram directory\n");
exit(1); exit(1);