ncurses 6.0 - patch 20161008

[ncurses.git] / progs / progs.priv.h

diff --git a/progs/progs.priv.h b/progs/progs.priv.h
index 3384d37c4e6dea01c97e86a765539ffb4ab5aab2..786fe558506e917fd3fd9ec655a71b9940f5980e 100644 (file)
--- a/progs/progs.priv.h
+++ b/progs/progs.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2014,2015 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            *
@@ -27,22 +27,25 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997,1998                   *
+ *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 /*
- * $Id: progs.priv.h,v 1.19 1999/02/23 11:10:32 tom Exp $
+ * $Id: progs.priv.h,v 1.41 2015/05/23 23:53:55 tom Exp $
  *
  *     progs.priv.h
  *
  *     Header file for curses utility programs
  */
 
+#ifndef PROGS_PRIV_H
+#define PROGS_PRIV_H 1
+
 #include <ncurses_cfg.h>
 
-#ifdef USE_RCS_IDS
+#if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
-#define MODULE_ID(id) /*nothing*/
+#define MODULE_ID(id)          /*nothing */
 #endif
 
 #include <stdlib.h>
@@ -52,10 +55,6 @@
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
-#else
-# if HAVE_LIBC_H
-# include <libc.h>
-# endif
 #endif
 
 #if HAVE_SYS_BSDTYPES_H
@@ -71,8 +70,17 @@
 #if HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
+# if defined(_FILE_OFFSET_BITS) && defined(HAVE_STRUCT_DIRENT64)
+#  if !defined(_LP64) && (_FILE_OFFSET_BITS == 64)
+#   define     DIRENT  struct dirent64
+#  else
+#   define     DIRENT  struct dirent
+#  endif
+# else
+#  define      DIRENT  struct dirent
+# endif
 #else
-# define dirent direct
+# define DIRENT struct direct
 # define NAMLEN(dirent) (dirent)->d_namlen
 # if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
@@ -85,6 +93,15 @@
 # endif
 #endif
 
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+
+#include <assert.h>
 #include <errno.h>
 
 #if DECL_ERRNO
@@ -93,7 +110,7 @@ extern int errno;
 
 #if HAVE_GETOPT_H
 #include <getopt.h>
-#else
+#elif !defined(HAVE_GETOPT_HEADER)
 /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its
  * variables doesn't hurt.
  */
@@ -103,8 +120,26 @@ extern int optind;
 
 #include <curses.h>
 #include <term_entry.h>
+#include <nc_termios.h>
 #include <tic.h>
+#include <nc_tparm.h>
+
+#include <nc_string.h>
 #include <nc_alloc.h>
+#if HAVE_NC_FREEALL
+#undef ExitProgram
+#ifdef USE_LIBTINFO
+#define ExitProgram(code) _nc_free_tinfo(code)
+#else
+#define ExitProgram(code) _nc_free_tic(code)
+#endif
+#endif
+
+#if defined(__GNUC__) && defined(_FORTIFY_SOURCE)
+#define IGNORE_RC(func) errno = (int) func
+#else
+#define IGNORE_RC(func) (void) func
+#endif /* gcc workarounds */
 
 /* usually in <unistd.h> */
 #ifndef STDOUT_FILENO
@@ -123,6 +158,18 @@ extern int optind;
 #define EXIT_FAILURE 1
 #endif
 
+#ifndef R_OK
+#define        R_OK    4               /* Test for readable.  */
+#endif
+
+#ifndef W_OK
+#define        W_OK    2               /* Test for writable.  */
+#endif
+
+#ifndef X_OK
+#define        X_OK    1               /* Test for executable.  */
+#endif
+
 #ifndef F_OK
 #define        F_OK    0               /* Test for existence.  */
 #endif
@@ -143,18 +190,24 @@ extern int optind;
 # elif defined(MAXPATHLEN)
 #  define PATH_MAX MAXPATHLEN
 # else
-#  define PATH_MAX 255 /* the Posix minimum pathsize */
+#  define PATH_MAX 255         /* the Posix minimum pathsize */
 # endif
 #endif
 
 /* We use isascii only to guard against use of 7-bit ctype tables in the
  * isprint test in infocmp.
  */
-#ifndef HAVE_ISASCII
+#if !HAVE_ISASCII
 # undef isascii
 # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127)
-#  define isascii(c) (((c) & 0xff) <= 127)
+#  define isascii(c) (UChar(c) <= 127)
 # else
-#  define isascii(c) 1 /* not really ascii anyway */
+#  define isascii(c) 1         /* not really ascii anyway */
 # endif
 #endif
+
+#define UChar(c)    ((unsigned char)(c))
+
+#define SIZEOF(v) (sizeof(v)/sizeof(v[0]))
+
+#endif /* PROGS_PRIV_H */