projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into stable
[gnulib.git]
/
lib
/
pty.in.h
diff --git
a/lib/pty.in.h
b/lib/pty.in.h
index
2780d61
..
af98dfe
100644
(file)
--- a/
lib/pty.in.h
+++ b/
lib/pty.in.h
@@
-37,6
+37,9
@@
# include <libutil.h>
#endif
# include <libutil.h>
#endif
+/* Get 'struct termios' and 'struct winsize'. */
+#include <termios.h>
+
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_WARN_ON_USE is copied here. */
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_WARN_ON_USE is copied here. */
@@
-45,21
+48,30
@@
/* Declare overridden functions. */
#if @GNULIB_FORKPTY@
/* Declare overridden functions. */
#if @GNULIB_FORKPTY@
+/* Create pseudo tty master slave pair and set terminal attributes
+ according to TERMP and WINP. Fork a child process attached to the
+ slave end. Return a handle for the master end in *AMASTER, and
+ return the name of the slave end in NAME. */
# if @REPLACE_FORKPTY@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef forkpty
# define forkpty rpl_forkpty
# endif
_GL_FUNCDECL_RPL (forkpty, int,
# if @REPLACE_FORKPTY@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef forkpty
# define forkpty rpl_forkpty
# endif
_GL_FUNCDECL_RPL (forkpty, int,
- (int *
, char *, struct termios const *
,
- struct
winsize const *
));
+ (int *
amaster, char *name
,
+ struct
termios const *termp, struct winsize const *winp
));
_GL_CXXALIAS_RPL (forkpty, int,
_GL_CXXALIAS_RPL (forkpty, int,
- (int *
, char *, struct termios const *
,
- struct
winsize const *
));
+ (int *
amaster, char *name
,
+ struct
termios const *termp, struct winsize const *winp
));
# else
# else
+# if !@HAVE_FORKPTY@
+_GL_FUNCDECL_SYS (forkpty, int,
+ (int *amaster, char *name,
+ struct termios const *termp, struct winsize const *winp));
+# endif
_GL_CXXALIAS_SYS (forkpty, int,
_GL_CXXALIAS_SYS (forkpty, int,
- (int *
, char *, struct termios const *
,
- struct
winsize const *
));
+ (int *
amaster, char *name
,
+ struct
termios const *termp, struct winsize const *winp
));
# endif
_GL_CXXALIASWARN (forkpty);
#elif defined GNULIB_POSIXCHECK
# endif
_GL_CXXALIASWARN (forkpty);
#elif defined GNULIB_POSIXCHECK
@@
-71,21
+83,29
@@
_GL_WARN_ON_USE (forkpty, "forkpty is not declared consistently - "
#endif
#if @GNULIB_OPENPTY@
#endif
#if @GNULIB_OPENPTY@
+/* Create pseudo tty master slave pair and set terminal attributes
+ according to TERMP and WINP. Return handles for both ends in
+ *AMASTER and *ASLAVE, and return the name of the slave end in NAME. */
# if @REPLACE_OPENPTY@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef openpty
# define openpty rpl_openpty
# endif
_GL_FUNCDECL_RPL (openpty, int,
# if @REPLACE_OPENPTY@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# undef openpty
# define openpty rpl_openpty
# endif
_GL_FUNCDECL_RPL (openpty, int,
- (int *
, int *, char *, struct termios const *
,
- struct
winsize const *
));
+ (int *
amaster, int *aslave, char *name
,
+ struct
termios const *termp, struct winsize const *winp
));
_GL_CXXALIAS_RPL (openpty, int,
_GL_CXXALIAS_RPL (openpty, int,
- (int *
, int *, char *, struct termios const *
,
- struct
winsize const *
));
+ (int *
amaster, int *aslave, char *name
,
+ struct
termios const *termp, struct winsize const *winp
));
# else
# else
+# if !@HAVE_OPENPTY@
+_GL_FUNCDECL_SYS (openpty, int,
+ (int *amaster, int *aslave, char *name,
+ struct termios const *termp, struct winsize const *winp));
+# endif
_GL_CXXALIAS_SYS (openpty, int,
_GL_CXXALIAS_SYS (openpty, int,
- (int *
, int *, char *, struct termios const *
,
- struct
winsize const *
));
+ (int *
amaster, int *aslave, char *name
,
+ struct
termios const *termp, struct winsize const *winp
));
# endif
_GL_CXXALIASWARN (openpty);
#elif defined GNULIB_POSIXCHECK
# endif
_GL_CXXALIASWARN (openpty);
#elif defined GNULIB_POSIXCHECK