drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcgetsid: fix return type 

* include/sys/termios.h (tcgetsid): Fix return type.
* termios.cc (tcgetsid): Likewise.
* fhandler_termios.cc (fhandler_termios::tcgetsid): Likewise.
* fhandler.h (fhandler_base): Likewise.
* fhandler.cc (fhandler_base::tcgetsid): Likewise.
This commit is contained in:
Eric Blake 2012-02-28 14:03:03 +00:00
parent d783d46cca
commit 580df3b6ae
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2012-02-28 Eric Blake <eblake@redhat.com>
* include/sys/termios.h (tcgetsid): Fix return type.
* termios.cc (tcgetsid): Likewise.
* fhandler_termios.cc (fhandler_termios::tcgetsid): Likewise.
* fhandler.h (fhandler_base): Likewise.
* fhandler.cc (fhandler_base::tcgetsid): Likewise.
2012-02-28 Corinna Vinschen <corinna@vinschen.de> 2012-02-28 Corinna Vinschen <corinna@vinschen.de>
* cygtls.cc (well_known_dlls): Add shlwapi.dll. * cygtls.cc (well_known_dlls): Add shlwapi.dll.

2
winsup/cygwin/fhandler.cc
View File

@ -1464,7 +1464,7 @@ fhandler_base::tcgetpgrp ()
return -1; return -1;
} }
int pid_t
fhandler_base::tcgetsid () fhandler_base::tcgetsid ()
{ {
set_errno (ENOTTY); set_errno (ENOTTY);

4
winsup/cygwin/fhandler.h
View File

@ -383,7 +383,7 @@ public:
virtual int tcgetattr (struct termios *t); virtual int tcgetattr (struct termios *t);
virtual int tcsetpgrp (const pid_t pid); virtual int tcsetpgrp (const pid_t pid);
virtual int tcgetpgrp (); virtual int tcgetpgrp ();
virtual int tcgetsid (); virtual pid_t tcgetsid ();
virtual bool is_tty () const { return false; } virtual bool is_tty () const { return false; }
virtual bool ispipe () const { return false; } virtual bool ispipe () const { return false; }
virtual pid_t get_popen_pid () const {return 0;} virtual pid_t get_popen_pid () const {return 0;}
@ -1155,7 +1155,7 @@ class fhandler_termios: public fhandler_base
virtual void __release_output_mutex (const char *fn, int ln) {} virtual void __release_output_mutex (const char *fn, int ln) {}
void echo_erase (int force = 0); void echo_erase (int force = 0);
virtual _off64_t lseek (_off64_t, int); virtual _off64_t lseek (_off64_t, int);
int tcgetsid (); pid_t tcgetsid ();
fhandler_termios (void *) {} fhandler_termios (void *) {}

4
winsup/cygwin/fhandler_termios.cc
View File

@ -1,7 +1,7 @@
/* fhandler_termios.cc /* fhandler_termios.cc
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009,
2010, 2011 Red Hat, Inc. 2010, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -401,7 +401,7 @@ fhandler_termios::sigflush ()
tcflush (TCIFLUSH); tcflush (TCIFLUSH);
} }
int pid_t
fhandler_termios::tcgetsid () fhandler_termios::tcgetsid ()
{ {
if (myself->ctty != -1 && myself->ctty == tc ()->ntty) if (myself->ctty != -1 && myself->ctty == tc ()->ntty)

6
winsup/cygwin/include/sys/termios.h
View File

@ -1,7 +1,7 @@
/* sys/termios.h /* sys/termios.h
Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006,
2007, 2008, 2009, 2010, 2011 Red Hat, Inc. 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -14,6 +14,8 @@ details. */
#ifndef _SYS_TERMIOS_H #ifndef _SYS_TERMIOS_H
#define _SYS_TERMIOS_H #define _SYS_TERMIOS_H
#include <sys/types.h>
#define TIOCMGET 0x5415 #define TIOCMGET 0x5415
#define TIOCMBIS 0x5416 #define TIOCMBIS 0x5416
#define TIOCMBIC 0x5417 #define TIOCMBIC 0x5417
@ -328,7 +330,7 @@ int tcsendbreak (int, int);
int tcdrain (int); int tcdrain (int);
int tcflush (int, int); int tcflush (int, int);
int tcflow (int, int); int tcflow (int, int);
int tcgetsid (int); pid_t tcgetsid (int);
void cfmakeraw (struct termios *); void cfmakeraw (struct termios *);
speed_t cfgetispeed(const struct termios *); speed_t cfgetispeed(const struct termios *);
speed_t cfgetospeed(const struct termios *); speed_t cfgetospeed(const struct termios *);

4
winsup/cygwin/termios.cc
View File

@ -1,7 +1,7 @@
/* termios.cc: termios for WIN32. /* termios.cc: termios for WIN32.
Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2008, 2009, 2010, 2011 Red Hat, Inc. 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
Written by Doug Evans and Steve Chamberlain of Cygnus Support Written by Doug Evans and Steve Chamberlain of Cygnus Support
dje@cygnus.com, sac@cygnus.com dje@cygnus.com, sac@cygnus.com
@ -207,7 +207,7 @@ tcgetpgrp (int fd)
return res; return res;
} }
extern "C" int extern "C" pid_t
tcgetsid (int fd) tcgetsid (int fd)
{ {
int res; int res;