diff options
| author | Damien Miller <djm@mindrot.org> | 2011-08-17 11:31:07 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-08-17 11:31:07 +1000 |
| commit | 9c08312968c965aca19d21f08407e21f5824f8b4 (patch) | |
| tree | cebfb1ce2a1e689141eeaf113f52064a086d9919 /openbsd-compat | |
| parent | a1226828add427f4ff29462b3153b1549d3b46a8 (diff) | |
| download | openssh-git-9c08312968c965aca19d21f08407e21f5824f8b4.tar.gz | |
- (djm) [ openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h]
binary_pipe is no longer required on Cygwin; patch from Corinna Vinschen
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/bsd-cygwin_util.c | 17 | ||||
| -rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 6 |
2 files changed, 3 insertions, 20 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c index e9fa3a0e..9eedc88d 100644 --- a/openbsd-compat/bsd-cygwin_util.c +++ b/openbsd-compat/bsd-cygwin_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> + * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,9 +34,6 @@ #if defined(open) && open == binary_open # undef open #endif -#if defined(pipe) && open == binary_pipe -# undef pipe -#endif #include <sys/types.h> @@ -59,18 +56,6 @@ binary_open(const char *filename, int flags, ...) return (open(filename, flags | O_BINARY, mode)); } -int -binary_pipe(int fd[2]) -{ - int ret = pipe(fd); - - if (!ret) { - setmode(fd[0], O_BINARY); - setmode(fd[1], O_BINARY); - } - return (ret); -} - int check_ntsec(const char *filename) { diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index 39b8eb78..48f64b74 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h @@ -1,7 +1,7 @@ -/* $Id: bsd-cygwin_util.h,v 1.12 2009/03/08 00:40:28 dtucker Exp $ */ +/* $Id: bsd-cygwin_util.h,v 1.13 2011/08/17 01:31:09 djm Exp $ */ /* - * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> + * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -41,13 +41,11 @@ #include <io.h> int binary_open(const char *, int , ...); -int binary_pipe(int fd[2]); int check_ntsec(const char *); char **fetch_windows_environment(void); void free_windows_environment(char **); #define open binary_open -#define pipe binary_pipe #endif /* HAVE_CYGWIN */ |