* fhandler.h (fhandler_tty_common::lseek): Declare new method.

(fhandler_tty_slave::lseek): Delete old method.
(fhandler_tty_master::lseek): Delete old method.
* fhandler_tty.cc (fhandler_tty_common::lseek): Define new method.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0e47658..009e291 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-18  Christopher Faylor  <cgf@timesys.com>
+
+       * fhandler.h (fhandler_tty_common::lseek): Declare new method.
+       (fhandler_tty_slave::lseek): Delete old method.
+       (fhandler_tty_master::lseek): Delete old method.
+       * fhandler_tty.cc (fhandler_tty_common::lseek): Define new method.
+
 2005-08-18  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_socket.cc (fhandler_socket::recvfrom): Always initialize

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 04a80b0..ce0bef7 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -944,6 +944,7 @@ class fhandler_tty_common: public fhandler_termios
   tty *get_ttyp () { return (tty *) tc; }
 
   int close ();
+  _off64_t lseek (_off64_t, int);
   void set_close_on_exec (bool val);
   void fixup_after_fork (HANDLE parent);
   select_record *select_read (select_record *s);
@@ -971,7 +972,6 @@ class fhandler_tty_slave: public fhandler_tty_common
   int dup (fhandler_base *child);
   void fixup_after_fork (HANDLE parent);
 
-  _off64_t lseek (_off64_t, int) { return 0; }
   select_record *select_read (select_record *s);
   int cygserver_attach_tty (HANDLE*, HANDLE*);
   int get_unit ();
@@ -1002,7 +1002,6 @@ public:
   int tcflush (int);
   int ioctl (unsigned int cmd, void *);
 
-  _off64_t lseek (_off64_t, int) { return 0; }
   char *ptsname ();
 
   void set_close_on_exec (bool val);

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index a7d0afb..ce2bd5d 100644 (file)
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1180,6 +1180,13 @@ fhandler_pty_master::open (int flags, mode_t)
   return 1;
 }
 
+_off64_t
+fhandler_tty_common::lseek (_off64_t, int)
+{
+  set_errno (ESPIPE);
+  return -1;
+}
+
 int
 fhandler_tty_common::close ()
 {