The first two patches fix Bug#1242. I will close that bug later.

Mon May 17 07:30:48 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>

* configure.in: Added check for getpt ()

* src/subshell.c (pty_open_master): use getpt () if available to open
the master side of the pty. getpt () is a glibc extension and is
needed when glibc 2.1.x is used with a (linux) kernel without unix98
style ptys (if there is no /dev/ptmx getpt falls back to bsd style
ptys).

* src/filegui.c (check_progress_buttons): Don't update the Gpm mouse
cursor when we check for events. It causes a flickering cursor on a
different virtual console.
This commit is contained in:
Norbert Warmuth 1999-05-17 05:51:44 +00:00
parent a92ba3aace
commit 7b0c8f25b3
5 changed files with 30 additions and 1 deletions

View File

@ -1,3 +1,7 @@
Mon May 17 07:30:48 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* configure.in: Added check for getpt ()
1999-05-05 Federico Mena Quintero <federico@nuclecu.unam.mx> 1999-05-05 Federico Mena Quintero <federico@nuclecu.unam.mx>
* configure.in (VERSION): Bumped version number to 4.5.31. * configure.in (VERSION): Bumped version number to 4.5.31.

View File

@ -169,6 +169,11 @@ AC_CHECK_FUNCS(memset memcpy tcsetattr tcgetattr cfgetospeed)
AC_CHECK_FUNCS(sigaction sigemptyset sigprocmask sigaddset) AC_CHECK_FUNCS(sigaction sigemptyset sigprocmask sigaddset)
AC_CHECK_FUNCS(sysconf setuid setreuid) AC_CHECK_FUNCS(sysconf setuid setreuid)
dnl
dnl getpt is a GNU Extension (glibc 2.1.x)
dnl
AC_CHECK_FUNCS(getpt)
SHADOWLIB= SHADOWLIB=
if test x$system = xLinux; then if test x$system = xLinux; then
AC_CHECK_LIB(shadow,pw_encrypt,[ AC_CHECK_LIB(shadow,pw_encrypt,[

View File

@ -1,3 +1,15 @@
Mon May 17 07:37:12 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* subshell.c (pty_open_master): use getpt () if available to open
the master side of the pty. getpt () is a glibc extension and is
needed when glibc 2.1.x is used with a (linux) kernel without unix98
style ptys (if there is no /dev/ptmx getpt falls back to bsd style
ptys).
* filegui.c (check_progress_buttons): Don't update the Gpm mouse
cursor when we check for events. It causes a flickering cursor on a
different virtual console.
1999-05-12 Pavel Machek <pavel@artax.karlin.mff.cuni.cz> 1999-05-12 Pavel Machek <pavel@artax.karlin.mff.cuni.cz>
* cons.saver.c (main): change cons.saver so it can be run without * cons.saver.c (main): change cons.saver so it can be run without

View File

@ -184,6 +184,7 @@ check_progress_buttons (FileOpContext *ctx)
ui = ctx->ui; ui = ctx->ui;
x_flush_events (); x_flush_events ();
event.x = -1; /* Don't show the GPM cursor */
c = get_event (&event, 0, 0); c = get_event (&event, 0, 0);
if (c == EV_NONE) if (c == EV_NONE)
return FILE_CONT; return FILE_CONT;

View File

@ -1094,8 +1094,15 @@ static int pty_open_master (char *pty_name)
char *slave_name; char *slave_name;
int pty_master; int pty_master;
#ifdef HAVE_GETPT
/* getpt () is a GNU extension (glibc 2.1.x) */
pty_master = getpt ();
#else
strcpy (pty_name, "/dev/ptmx"); strcpy (pty_name, "/dev/ptmx");
if ((pty_master = open (pty_name, O_RDWR)) == -1 pty_master = open (pty_name, O_RDWR)
#endif
if (pty_master == -1
|| grantpt (pty_master) == -1 /* Grant access to slave */ || grantpt (pty_master) == -1 /* Grant access to slave */
|| unlockpt (pty_master) == -1 /* Clear slave's lock flag */ || unlockpt (pty_master) == -1 /* Clear slave's lock flag */
|| !(slave_name = ptsname (pty_master))) /* Get slave's name */ || !(slave_name = ptsname (pty_master))) /* Get slave's name */