ncurses 5.9 - patch 20110807

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

diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 87c4f462fd4f05b090c56afe3463a926e1ca2b7f..6c4df591784a074575d71c1727edd5fde7cd0354 100644 (file)
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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,11 +33,18 @@
 #include <curses.priv.h>
 
 #include <ctype.h>
-#include <sys/stat.h>
 
 #include <tic.h>
 
-MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.20 2011/06/05 00:48:00 tom Exp $")
+
+#ifdef __TANDEM
+#define ROOT_UID 65535
+#endif
+
+#ifndef ROOT_UID
+#define ROOT_UID 0
+#endif
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -108,7 +115,11 @@ _nc_basename(char *path)
 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) {
@@ -121,11 +132,14 @@ _nc_access(const char *path, int mode)
            if (head == leaf)
                (void) strcpy(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)
@@ -135,7 +149,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;
@@ -148,7 +162,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;
@@ -170,6 +184,7 @@ _nc_env_access(void)
        || getgid() != getegid())
        return FALSE;
 #endif
-    return getuid() != 0 && geteuid() != 0;    /* ...finally, disallow root */
+    /* ...finally, disallow root */
+    return (getuid() != ROOT_UID) && (geteuid() != ROOT_UID);
 }
 #endif