ncurses 6.1 - patch 20190623

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

diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 08091aa4057bb6cc74c5767cbda275258774b906..e086bd0c66958542fb93e38f88507c9681884a9c 100644 (file)
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2019 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            *


@@ -33,12 +33,10 @@
 #include <curses.priv.h>
 
 #include <ctype.h>
 #include <curses.priv.h>
 
 #include <ctype.h>

-#include <sys/stat.h>

 
 #include <tic.h>
 
 #include <tic.h>

-#include <nc_alloc.h>

 
 

-MODULE_ID("$Id: access.c,v 1.15 2009/04/05 00:03:10 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.24 2019/01/19 15:38:07 tom Exp $")

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


@@ -54,7 +52,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)


@@ -109,24 +107,33 @@ _nc_basename(char *path)
 NCURSES_EXPORT(int)
 _nc_access(const char *path, int mode)
 {
 NCURSES_EXPORT(int)
 _nc_access(const char *path, int mode)
 {

-    if (access(path, mode) < 0) {
+    int result;
+
+    if (path == 0) {
+       result = -1;
+    } 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));

 
 

-           return access(head, R_OK | W_OK | X_OK);
+           result = access(head, R_OK | W_OK | X_OK);
+       } else {
+           result = -1;

        }
        }

-       return -1;
+    } else {
+       result = 0;

     }
     }

-    return 0;
+    return result;

 }
 
 NCURSES_EXPORT(bool)
 }
 
 NCURSES_EXPORT(bool)


@@ -136,7 +143,7 @@ _nc_is_dir_path(const char *path)
     struct stat sb;
 
     if (stat(path, &sb) == 0
     struct stat sb;
 
     if (stat(path, &sb) == 0

-       && (sb.st_mode & S_IFMT) == S_IFDIR) {
+       && S_ISDIR(sb.st_mode)) {

        result = TRUE;
     }
     return result;
        result = TRUE;
     }
     return result;


@@ -149,7 +156,7 @@ _nc_is_file_path(const char *path)
     struct stat sb;
 
     if (stat(path, &sb) == 0
     struct stat sb;
 
     if (stat(path, &sb) == 0

-       && (sb.st_mode & S_IFMT) == S_IFREG) {
+       && S_ISREG(sb.st_mode)) {

        result = TRUE;
     }
     return result;
        result = TRUE;
     }
     return result;


@@ -171,6 +178,7 @@ _nc_env_access(void)
        || getgid() != getegid())
        return FALSE;
 #endif
        || getgid() != getegid())
        return FALSE;
 #endif

-    return getuid() != 0 && geteuid() != 0;    /* ...finally, disallow root */
+    /* ...finally, disallow root */
+    return (getuid() != ROOT_UID) && (geteuid() != ROOT_UID);

 }
 #endif
 }
 #endif