ncurses 5.7 - patch 20090718

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

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

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


@@ -27,30 +27,86 @@
  ****************************************************************************/
 
 /****************************************************************************
  ****************************************************************************/
 
 /****************************************************************************

- *  Author: Thomas E. Dickey <dickey@clark.net> 1998,2000                   *
+ *  Author: Thomas E. Dickey                                                *

  ****************************************************************************/
 
 #include <curses.priv.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.4 2000/10/08 01:25:06 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.15 2009/04/05 00:03:10 tom Exp $")

 
 

-char *
-_nc_basename(char *path)
+#define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
+
+NCURSES_EXPORT(char *)
+_nc_rootname(char *path)
+{
+    char *result = _nc_basename(path);
+#if !MIXEDCASE_FILENAMES || defined(PROG_EXT)
+    static char *temp;
+    char *s;
+
+    temp = strdup(result);
+    result = temp;
+#if !MIXEDCASE_FILENAMES
+    for (s = result; *s != '\0'; ++s) {
+       *s = LOWERCASE(*s);
+    }
+#endif
+#if defined(PROG_EXT)
+    if ((s = strrchr(result, '.')) != 0) {
+       if (!strcmp(s, PROG_EXT))
+           *s = '\0';
+    }
+#endif
+#endif
+    return result;
+}
+
+/*
+ * Check if a string appears to be an absolute pathname.
+ */
+NCURSES_EXPORT(bool)
+_nc_is_abs_path(const char *path)

 {
 {

-    char *result = strrchr(path, '/');
+#if defined(__EMX__) || defined(__DJGPP__)
+#define is_pathname(s) ((((s) != 0) && ((s)[0] == '/')) \
+                 || (((s)[0] != 0) && ((s)[1] == ':')))
+#else
+#define is_pathname(s) ((s) != 0 && (s)[0] == '/')
+#endif
+    return is_pathname(path);
+}
+
+/*
+ * Return index of the basename
+ */
+NCURSES_EXPORT(unsigned)
+_nc_pathlast(const char *path)
+{
+    const char *test = strrchr(path, '/');

 #ifdef __EMX__
 #ifdef __EMX__

-    if (result == 0)
-       result = strrchr(path, '\\');
+    if (test == 0)
+       test = strrchr(path, '\\');

 #endif
 #endif

-    if (result == 0)
-       result = path;
+    if (test == 0)
+       test = path;

     else
     else

-       result++;
-    return result;
+       test++;
+    return (unsigned) (test - path);
+}
+
+NCURSES_EXPORT(char *)
+_nc_basename(char *path)
+{
+    return path + _nc_pathlast(path);

 }
 
 }
 

-int
+NCURSES_EXPORT(int)

 _nc_access(const char *path, int mode)
 {
     if (access(path, mode) < 0) {
 _nc_access(const char *path, int mode)
 {
     if (access(path, mode) < 0) {


@@ -73,12 +129,38 @@ _nc_access(const char *path, int mode)
     return 0;
 }
 
     return 0;
 }
 

+NCURSES_EXPORT(bool)
+_nc_is_dir_path(const char *path)
+{
+    bool result = FALSE;
+    struct stat sb;
+
+    if (stat(path, &sb) == 0
+       && (sb.st_mode & S_IFMT) == S_IFDIR) {
+       result = TRUE;
+    }
+    return result;
+}
+
+NCURSES_EXPORT(bool)
+_nc_is_file_path(const char *path)
+{
+    bool result = FALSE;
+    struct stat sb;
+
+    if (stat(path, &sb) == 0
+       && (sb.st_mode & S_IFMT) == S_IFREG) {
+       result = TRUE;
+    }
+    return result;
+}
+

 #ifndef USE_ROOT_ENVIRON
 /*
  * Returns true if we allow application to use environment variables that are
  * used for searching lists of directories, etc.
  */
 #ifndef USE_ROOT_ENVIRON
 /*
  * Returns true if we allow application to use environment variables that are
  * used for searching lists of directories, etc.
  */

-int
+NCURSES_EXPORT(int)

 _nc_env_access(void)
 {
 #if HAVE_ISSETUGID
 _nc_env_access(void)
 {
 #if HAVE_ISSETUGID


@@ -86,9 +168,9 @@ _nc_env_access(void)
        return FALSE;
 #elif HAVE_GETEUID && HAVE_GETEGID
     if (getuid() != geteuid()
        return FALSE;
 #elif HAVE_GETEUID && HAVE_GETEGID
     if (getuid() != geteuid()

-     || getgid() != getegid())
+       || getgid() != getegid())

        return FALSE;
 #endif
        return FALSE;
 #endif

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

 }
 #endif
 }
 #endif