ncurses 6.1 - patch 20190406

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

diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 6c4df591784a074575d71c1727edd5fde7cd0354..e086bd0c66958542fb93e38f88507c9681884a9c 100644 (file)
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2011 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            *
@@ -36,15 +36,7 @@
 
 #include <tic.h>
 
-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
+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))
 
@@ -60,7 +52,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)
@@ -124,13 +116,15 @@ _nc_access(const char *path, int mode)
            && 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);
        } else {