diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /openbsd-compat/bsd-cygwin_util.c | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.c')
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c index e9fa3a0e2..9eedc88d2 100644 --- a/openbsd-compat/bsd-cygwin_util.c +++ b/openbsd-compat/bsd-cygwin_util.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> | 2 | * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> |
3 | * | 3 | * |
4 | * Redistribution and use in source and binary forms, with or without | 4 | * Redistribution and use in source and binary forms, with or without |
5 | * modification, are permitted provided that the following conditions | 5 | * modification, are permitted provided that the following conditions |
@@ -34,9 +34,6 @@ | |||
34 | #if defined(open) && open == binary_open | 34 | #if defined(open) && open == binary_open |
35 | # undef open | 35 | # undef open |
36 | #endif | 36 | #endif |
37 | #if defined(pipe) && open == binary_pipe | ||
38 | # undef pipe | ||
39 | #endif | ||
40 | 37 | ||
41 | #include <sys/types.h> | 38 | #include <sys/types.h> |
42 | 39 | ||
@@ -59,18 +56,6 @@ binary_open(const char *filename, int flags, ...) | |||
59 | return (open(filename, flags | O_BINARY, mode)); | 56 | return (open(filename, flags | O_BINARY, mode)); |
60 | } | 57 | } |
61 | 58 | ||
62 | int | ||
63 | binary_pipe(int fd[2]) | ||
64 | { | ||
65 | int ret = pipe(fd); | ||
66 | |||
67 | if (!ret) { | ||
68 | setmode(fd[0], O_BINARY); | ||
69 | setmode(fd[1], O_BINARY); | ||
70 | } | ||
71 | return (ret); | ||
72 | } | ||
73 | |||
74 | int | 59 | int |
75 | check_ntsec(const char *filename) | 60 | check_ntsec(const char *filename) |
76 | { | 61 | { |