tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [ openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h]

Browse Source 
binary_pipe is no longer required on Cygwin; patch from Corinna Vinschen
This commit is contained in:
Damien Miller 2011-08-17 11:31:07 +10:00
parent a1226828ad
commit 9c08312968
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
20110817 20110817
- (tim) [mac.c myproposal.h] Wrap SHA256 and SHA512 in ifdefs for - (tim) [mac.c myproposal.h] Wrap SHA256 and SHA512 in ifdefs for
OpenSSL 0.9.7. ok djm OpenSSL 0.9.7. ok djm
- (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
20110812 20110812
- (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context - (dtucker) [openbsd-compat/port-linux.c] Bug 1924: Improve selinux context

17
openbsd-compat/bsd-cygwin_util.c
View File

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -34,9 +34,6 @@
#if defined(open) && open == binary_open #if defined(open) && open == binary_open
# undef open # undef open
#endif #endif
#if defined(pipe) && open == binary_pipe
# undef pipe
#endif
#include <sys/types.h> #include <sys/types.h>
@ -59,18 +56,6 @@ binary_open(const char *filename, int flags, ...)
return (open(filename, flags | O_BINARY, mode)); 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 int
check_ntsec(const char *filename) check_ntsec(const char *filename)
{ {

6
openbsd-compat/bsd-cygwin_util.h
View File

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -41,13 +41,11 @@
#include <io.h> #include <io.h>
int binary_open(const char *, int , ...); int binary_open(const char *, int , ...);
int binary_pipe(int fd[2]);
int check_ntsec(const char *); int check_ntsec(const char *);
char **fetch_windows_environment(void); char **fetch_windows_environment(void);
void free_windows_environment(char **); void free_windows_environment(char **);
#define open binary_open #define open binary_open
#define pipe binary_pipe
#endif /* HAVE_CYGWIN */ #endif /* HAVE_CYGWIN */