ncurses 6.2 - patch 20200711

[ncurses.git] / ncurses / tinfo / access.c

diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index b96898a63532021591666c8037a863e496719076..047ece40a4a9bf899cbcfe4284eb1d29f9095583 100644 (file)
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 1998-2011,2012 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -33,22 +34,19 @@
 #include <curses.priv.h>
 
 #include <ctype.h>
-#include <sys/stat.h>
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.18 2011/05/28 23:05:12 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.26 2020/07/11 20:55:23 anonymous.maarten Exp $")
 
-#ifdef __TANDEM
-#define ROOT_UID 65535
-#endif
+#define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
-#ifndef ROOT_UID
-#define ROOT_UID 0
+#ifdef _MSC_VER
+# define ACCESS(FN, MODE) access((FN), (MODE)&(R_OK|W_OK))
+#else
+# define ACCESS access
 #endif
 
-#define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
-
 NCURSES_EXPORT(char *)
 _nc_rootname(char *path)
 {
@@ -61,7 +59,7 @@ _nc_rootname(char *path)
     result = temp;
 #if !MIXEDCASE_FILENAMES
     for (s = result; *s != '\0'; ++s) {
-       *s = LOWERCASE(*s);
+       *s = (char) LOWERCASE(*s);
     }
 #endif
 #if defined(PROG_EXT)
@@ -120,20 +118,22 @@ _nc_access(const char *path, int mode)
 
     if (path == 0) {
        result = -1;
-    } else if (access(path, mode) < 0) {
+    } else if (ACCESS(path, mode) < 0) {
        if ((mode & W_OK) != 0
            && errno == ENOENT
            && strlen(path) < PATH_MAX) {
            char head[PATH_MAX];
-           char *leaf = _nc_basename(strcpy(head, path));
+           char *leaf;
 
+           _nc_STRCPY(head, path, sizeof(head));
+           leaf = _nc_basename(head);
            if (leaf == 0)
                leaf = head;
            *leaf = '\0';
            if (head == leaf)
-               (void) strcpy(head, ".");
+               _nc_STRCPY(head, ".", sizeof(head));
 
-           result = access(head, R_OK | W_OK | X_OK);
+           result = ACCESS(head, R_OK | W_OK | X_OK);
        } else {
            result = -1;
        }
@@ -150,7 +150,7 @@ _nc_is_dir_path(const char *path)
     struct stat sb;
 
     if (stat(path, &sb) == 0
-       && (sb.st_mode & S_IFMT) == S_IFDIR) {
+       && S_ISDIR(sb.st_mode)) {
        result = TRUE;
     }
     return result;
@@ -163,7 +163,7 @@ _nc_is_file_path(const char *path)
     struct stat sb;
 
     if (stat(path, &sb) == 0
-       && (sb.st_mode & S_IFMT) == S_IFREG) {
+       && S_ISREG(sb.st_mode)) {
        result = TRUE;
     }
     return result;