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

directory to be created exists, just check errno afterwards.

[_WIN32] (F_OK, W_OK, R_OK): Unused, remove.

diff --git a/include/misc.h b/include/misc.h
index 34370ca597baf0a1e3ccf37e3e09d5b56d935d00..a9d1b8fe1868878148a19c87852ed6d193f56267 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -60,15 +60,6 @@ typedef long ssize_t;
 
 #define strncasecmp(s1, s2, s3) _strnicmp(s1, s2, s3)
 #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;
 #define vsnprintf _vsnprintf

diff --git a/src/util/files.c b/src/util/files.c
index 6624e00ed658019a2a2e20dfe0f9bc6561fc5ca9..0fc515dd878101525a11fca992dcd142fc22e59b 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -119,7 +119,7 @@ main(int argc, char *argv[])
 
     ef_init();
 
-    if (access(gamedir, F_OK) < 0 && mkdir(gamedir, 0750) < 0) {
+    if (mkdir(gamedir, 0750) < 0 && errno != EEXIST) {
        perror(gamedir);
        printf("Can't make game directory\n");
        exit(1);
@@ -175,7 +175,7 @@ main(int argc, char *argv[])
            putrealm(&realm);
        }
     }
-    if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) {
+    if (mkdir(teldir, 0750) < 0 && errno != EEXIST) {
        perror(teldir);
        printf("Can't make telegram directory\n");
        exit(1);