diff options
| -rw-r--r-- | README.cygwin | 13 | ||||
| -rw-r--r-- | cygwin/cygwin.c | 15 | ||||
| -rw-r--r-- | t/lib/cygwin.t | 3 |
3 files changed, 5 insertions, 26 deletions
diff --git a/README.cygwin b/README.cygwin index ac85a9d5cf..3bccc3e6eb 100644 --- a/README.cygwin +++ b/README.cygwin @@ -409,10 +409,10 @@ F<http://www.okisoft.co.jp/esc/utf8-cygwin/> When a file is opened it is in either text or binary mode. In text mode a file is subject to CR/LF/Ctrl-Z translations. With Cygwin, the default mode for an C<open()> is determined by the mode of the mount that underlies -the file. See C<Cygwin::is_binmount()> and C<Cygwin::is_textmount()>. -Perl provides a C<binmode()> function to set binary mode on files -that otherwise would be treated as text. C<sysopen()> with the C<O_TEXT> -flag sets text mode on files that otherwise would be treated as binary: +the file. See C<Cygwin::is_binmount()>. Perl provides a C<binmode()> function +to set binary mode on files that otherwise would be treated as text. +C<sysopen()> with the C<O_TEXT> flag sets text mode on files that otherwise +would be treated as binary: sysopen(FOO, "bar", O_WRONLY|O_CREAT|O_TEXT) @@ -557,11 +557,6 @@ User mounts override system mounts. Returns true if the given cygwin path is binary mounted, false if the path is mounted in textmode. -=item C<Cygwin::is_textmount> - -Returns true if the given cygwin path is mounted in textmode (C<"\r\n"> C<lt>=C<gt> C<"\n">), -false if the path is mounted binary. The result is complementary to C<Cygwin::is_binmount()>. - =back =head1 INSTALL PERL ON CYGWIN diff --git a/cygwin/cygwin.c b/cygwin/cygwin.c index 60d7d9488d..8a1ef03839 100644 --- a/cygwin/cygwin.c +++ b/cygwin/cygwin.c @@ -347,20 +347,6 @@ XS(XS_Cygwin_is_binmount) XSRETURN(1); } -XS(XS_Cygwin_is_textmount) -{ - dXSARGS; - char *pathname; - - if (items != 1) - Perl_croak(aTHX_ "Usage: Cygwin::is_textmount(pathname)"); - - pathname = SvPV_nolen(ST(0)); - - ST(0) = boolSV(!cygwin_internal(CW_GET_BINMODE, pathname)); - XSRETURN(1); -} - void init_os_extras(void) { @@ -376,7 +362,6 @@ init_os_extras(void) newXSproto("Cygwin::mount_table", XS_Cygwin_mount_table, file, ""); newXSproto("Cygwin::mount_flags", XS_Cygwin_mount_flags, file, "$"); newXSproto("Cygwin::is_binmount", XS_Cygwin_is_binmount, file, "$"); - newXSproto("Cygwin::is_textmount", XS_Cygwin_is_textmount, file, "$"); /* Initialize Win32CORE if it has been statically linked. */ handle = dlopen(NULL, RTLD_LAZY); diff --git a/t/lib/cygwin.t b/t/lib/cygwin.t index 00cd05fec0..d92031db3e 100644 --- a/t/lib/cygwin.t +++ b/t/lib/cygwin.t @@ -9,7 +9,7 @@ BEGIN { } } -use Test::More tests => 15; +use Test::More tests => 14; is(Cygwin::winpid_to_pid(Cygwin::pid_to_winpid($$)), $$, "perl pid translates to itself"); @@ -46,7 +46,6 @@ my $mount = join '', `/usr/bin/mount`; $mount =~ m|on /usr/bin type .+ \((\w+mode)\)|m; my $binmode = $1 eq 'binmode'; is(Cygwin::is_binmount("/"), $binmode ? 1 : '', "check / for binmount"); -is(Cygwin::is_textmount("/"), $binmode ? '' : 1, "check / for textmount"); my $rootmnt = Cygwin::mount_flags("/"); ok($binmode ? ($rootmnt =~ /,binmode/) : ($rootmnt =~ /,textmode/), "check / mount_flags"); |