components/text-utilities/patches/ttyutils.h.patch
author Rich Burridge <rich.burridge@oracle.com>
Wed, 21 Jan 2015 17:36:13 -0800
branchs11-update
changeset 3666 f6b2b3066ff4
child 3897 cd126ba3fdda
permissions -rw-r--r--
PSARC 2014/170 text-utilities version 2.24.2 18307792 request for "column" utility in Userland

Changes needed to get column to build on Solaris

These changes will be sent upstream.

--- util-linux-2.24.2/include/ttyutils.h.orig	2014-05-13 10:55:05.789258799 -0700
+++ util-linux-2.24.2/include/ttyutils.h	2014-05-13 11:05:20.943543261 -0700
@@ -57,6 +57,29 @@
 #define UL_TTY_KEEPCFLAGS	(1 << 1)
 #define UL_TTY_UTF8		(1 << 2)
 
+/* These are not defined in Solaris. Taken from tmux compat/ttydefaults.h */
+#ifndef OXTABS
+#define OXTABS 0
+#endif
+#ifndef TTYDEF_IFLAG
+#define	TTYDEF_IFLAG	(BRKINT | ICRNL | IMAXBEL | IXON | IXANY)
+#endif
+#ifndef TTYDEF_OFLAG
+#define TTYDEF_OFLAG	(OPOST | ONLCR | OXTABS)
+#endif
+#ifndef TTYDEF_LFLAG
+#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
+#endif
+#ifndef TTYDEF_CFLAG
+#define TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
+#endif
+#ifndef CREPRINT
+#define	CREPRINT 	CTRL('r')
+#endif
+#ifndef CDISCARD
+#define	CDISCARD 	CTRL('o')
+#endif
+
 static inline void reset_virtual_console(struct termios *tp, int flags)
 {
 	/* Use defaults of <sys/ttydefaults.h> for base settings */