ncurses 6.2 - patch 20210320

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

diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 6c4df591784a074575d71c1727edd5fde7cd0354..15593688266ef754f4fb28fc5ce4a35cea93a0d9 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -36,18 +37,16 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: access.c,v 1.20 2011/06/05 00:48:00 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.27 2020/08/29 16:22:03 juergen 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 _NC_MSC
+# define ACCESS(FN, MODE) access((FN), (MODE)&(R_OK|W_OK))
+#else
+# define ACCESS access

 #endif
 
 #endif
 

-#define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
-

 NCURSES_EXPORT(char *)
 _nc_rootname(char *path)
 {
 NCURSES_EXPORT(char *)
 _nc_rootname(char *path)
 {


@@ -60,7 +59,7 @@ _nc_rootname(char *path)
     result = temp;
 #if !MIXEDCASE_FILENAMES
     for (s = result; *s != '\0'; ++s) {
     result = temp;
 #if !MIXEDCASE_FILENAMES
     for (s = result; *s != '\0'; ++s) {

-       *s = LOWERCASE(*s);
+       *s = (char) LOWERCASE(*s);

     }
 #endif
 #if defined(PROG_EXT)
     }
 #endif
 #if defined(PROG_EXT)


@@ -119,20 +118,22 @@ _nc_access(const char *path, int mode)
 
     if (path == 0) {
        result = -1;
 
     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];
        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)
            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;
        }
        } else {
            result = -1;
        }