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

(main): Don't use access() before mkdir() to check whether the

Browse source 
directory to be created exists, just check errno afterwards.

[_WIN32] (F_OK, W_OK, R_OK): Unused, remove.
This commit is contained in:
Markus Armbruster 2006-02-18 09:29:49 +00:00
parent 5282f500b5
commit 376d87c3a0
2 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/misc.h
View file

@ -60,15 +60,6 @@ typedef long ssize_t;
#define strncasecmp(s1, s2, s3) _strnicmp(s1, s2, s3) #define strncasecmp(s1, s2, s3) _strnicmp(s1, s2, s3)
#define mkdir(dir,perm) _mkdir((dir)) #define mkdir(dir,perm) _mkdir((dir))
#ifndef F_OK
#define F_OK 0 /* FILE existence */
#endif
#ifndef W_OK
#define W_OK 02 /* Write permission */
#endif
#ifndef R_OK
#define R_OK 04 /* Read permission */
#endif
typedef int pid_t; typedef int pid_t;
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf

4
src/util/files.c
View file

@ -119,7 +119,7 @@ main(int argc, char *argv[])
ef_init(); ef_init();
if (access(gamedir, F_OK) < 0 && mkdir(gamedir, 0750) < 0) { if (mkdir(gamedir, 0750) < 0 && errno != EEXIST) {
perror(gamedir); perror(gamedir);
printf("Can't make game directory\n"); printf("Can't make game directory\n");
exit(1); exit(1);
@ -175,7 +175,7 @@ main(int argc, char *argv[])
putrealm(&realm); putrealm(&realm);
} }
} }
if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) { if (mkdir(teldir, 0750) < 0 && errno != EEXIST) {
perror(teldir); perror(teldir);
printf("Can't make telegram directory\n"); printf("Can't make telegram directory\n");
exit(1); exit(1);