From: Gurusamy Sarathy Date: Mon, 8 May 2000 14:22:22 +0000 (+0000) Subject: cygwin update (from Eric Fifer ) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b4bcd66247e5bc9051bd228e0f63bc1a5ffcf2a7;p=p5sagit%2Fp5-mst-13.2.git cygwin update (from Eric Fifer ) p4raw-id: //depot/perl@6094 --- diff --git a/README.cygwin b/README.cygwin index 514e013..eb6c289 100644 --- a/README.cygwin +++ b/README.cygwin @@ -13,7 +13,7 @@ on Cygwin. This document also describes features of Cygwin that will affect how Perl behaves at runtime. B There are pre-built Perl packages available for Cygwin and a -version of Perl is provided on the Cygwin CD. If you have no need to +version of Perl is provided on the Cygwin CD. If you do not need to customize the configuration, consider using one of these packages: http://cygutils.netpedia.net/ @@ -31,27 +31,16 @@ about this project can be found at: A recent net or commercial release of Cygwin is required. -At the time this document was written, the port required recent -development snapshots that were expected to stabilize early in 2000 and -be released to the net as B21 and commercially as v1.1. +At the time this document was written, Cygwin 1.1.1 was current. B At this point, minimal effort has been made to provide compatibility with old (beta) Cygwin releases. The focus has been to provide a high quality release and not worry about working around old Cygwin bugs. If you wish to use Perl with Cygwin B20.1 or earlier, -consider using either perl5.005_03 or perl5.005_62, which are available -in source and binary form at C or on the -Cygwin CD. If there is significant demand, a patch kit can be developed -to port back to earlier Cygwin versions. - -=head2 Compiler - -A recent net or commercial release of I is required. - -At the time this document was written, I was current and -could be downloaded from: - - ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/cygwin/gcc-2.95.2/ +consider using perl5.005_03, which is available in source and binary +form at C or on the Cygwin CD. If there +is significant demand, a patch kit can be developed to port back to +earlier Cygwin versions. =head2 Cygwin Configuration @@ -62,13 +51,9 @@ Perl usage. B The binaries that are built will run on all Win32 versions. They do not depend on your host system (Win9x, WinNT) or your Cygwin configuration (I, I, binary/text mounts). The only -dependencies come from hardcoded pathnames like C. However, +dependencies come from hard-coded pathnames like C. However, your host system and Cygwin configuration will affect Perl's runtime -behavior (see L). Some regression tests may fail in different -ways depending on your setup. For now, the test suite does not skip -tests that do not make sense given a particular setup. If a test can -pass in some Cygwin setup, it is left in and explainable test failures -are documented. +behavior (see L). =over 4 @@ -78,23 +63,10 @@ Set the C environment variable so that Configure finds the Cygwin versions of programs. Any Windows directories should be removed or moved to the end of your C. -=item * F - -There should be an instance of I in F (or F). -Configure tests C<#!/bin/cat> and if it is not found, you will see -the error: - - Configure: ./try: No such file or directory - -=item * F - -If you do not have a F directory, Configure will B prompt -you to install I into F. - =item * I If you do not have I (which is part of the I package), -Configure will B prompt you to install man pages. +Configure will B prompt you to install I pages. =item * Permissions @@ -123,7 +95,7 @@ This will run Configure and keep a record: ./Configure 2>&1 | tee log.configure -If you are willing to accept all the defaults add a B<-d> option. +If you are willing to accept all the defaults run Configure with B<-de>. However, several useful customizations are available. =head2 Strip Binaries @@ -157,18 +129,14 @@ The crypt libraries in GNU libc have been ported to Cygwin. The DES based Ultra Fast Crypt port was done by Alexey Truhan: - http://dome.weeg.uiowa.edu/pub/domestic/sos/cw32crypt-dist-0.tgz + ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/porters/Okhapkin_Sergey/cw32crypt-dist-0.tgz NOTE: There are various export restrictions on DES implementations, see the glibc README for more details. The MD5 port was done by Andy Piper: - http://dome.weeg.uiowa.edu/pub/domestic/sos/libcrypt.tgz - -More information can also be found at: - - http://miracle.geol.msu.ru/sos/ + ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/porters/Okhapkin_Sergey/libcrypt.tgz =item * C<-lgdbm> (C) @@ -186,8 +154,11 @@ F. A port of SysV IPC is available for Cygwin. NOTE: This has B been extensively tested. In particular, -C is undefined because it fails a configure test and on -Win9x the shm*() functions seem to hang. +C is undefined because it fails a Configure test +and on Win9x the I functions seem to hang. It also creates +a compile time dependency because F includes F<> +and F<> (which will be required in the future when compiling +CPAN modules). =back @@ -250,10 +221,9 @@ You may see some messages during Configure that seem suspicious. =item * Whoa There -Cygwin does not yet implement chroot(), setegid() or seteuid() -functionality, but has stub functions that return C. You will -see a message when Configure detects that its guess conflicts with the -hint file. +Cygwin does not yet implement chroot() functionality, but has a stub +function that returns C. You will see a message when Configure +detects that its guess conflicts with the hint file. *** WHOA THERE!!! *** The recommended value for $d_chroot on this machine was "undef"! @@ -261,19 +231,20 @@ hint file. You should keep the recommended value. -=item * dlsym +=item * I I is needed to build dynamic libraries, but it does not exist when dlsym() checking occurs (it is not created until `C' runs). You will see the following message: Checking whether your dlsym() needs a leading underscore ... + ld2: not found I can't compile and run the test program. I'm guessing that dlsym doesn't need a leading underscore. Since the guess is correct, this is not a problem. -=item * Win9x and d_eofnblk +=item * Win9x and C Win9x does not correctly report C with a non-blocking read on a closed pipe. You will see the following messages: @@ -310,7 +281,7 @@ This failure does not seem to cause any problems. =head1 MAKE -Simply run make and wait: +Simply run I and wait: make 2>&1 | tee log.make @@ -332,9 +303,9 @@ wait until the `C' process to install the I script, this is because the remainder of the `C' refers to I without fully specifying its path and does this from multiple subdirectories. The assumption is that $installbin is in your current C. If this -is not the case or if you do not have an I program, `C' -will fail at some point. If this happens, just manually copy I -from the source directory to someplace in your C. +is not the case `C' will fail at some point. If this happens, +just manually copy I from the source directory to somewhere in +your C. =head1 TEST @@ -348,21 +319,23 @@ The same tests are run both times, but more information is provided when running as `C<./perl harness>'. Test results vary depending on your host system and your Cygwin -configuration. It is possible that Cygwin will pass all the tests, -but it is more likely that some tests will fail for one of these reasons. +configuration. If a test can pass in some Cygwin setup, it is always +attempted and explainable test failures are documented. It is possible +that Perl will pass all the tests, but it is more likely that some tests +will fail for one of these reasons. =head2 File Permissions UNIX file permissions are based on sets of mode bits for -{read,write,execute} for each {user,group,other}. By default Cygwin only -tracks the Win32 readonly attribute represented as the UNIX file user -write bit (files are always readable, files are executable if they have -a F<.{com,bat,exe}> extension or begin with C<#!>, directories are always -readable and executable). On WinNT with the I C setting, -the remaining mode bits are stored as extended attributes. On WinNT -with the I C setting, permissions use the standard WinNT -security descriptors and access control lists. Without one of these -options, these tests will fail: +{read,write,execute} for each {user,group,other}. By default Cygwin +only tracks the Win32 read-only attribute represented as the UNIX file +user write bit (files are always readable, files are executable if they +have a F<.{com,bat,exe}> extension or begin with C<#!>, directories are +always readable and executable). On WinNT with the I C +setting, the additional mode bits are stored as extended file attributes. +On WinNT with the I C setting, permissions use the standard +WinNT security descriptors and access control lists. Without one of +these options, these tests will fail: Failed Test List of failed ------------------------------------ @@ -420,8 +393,13 @@ will fail: ------------------------------------ op/taint.t 1, 3, 31, 37 -Alternatively, you can copy F into one of the Windows system -directories (although, this is B recommended). +Alternatively, you can copy F into the directory where the +tests run: + + cp `type -p cygwin1.dll` t + +or one of the Windows system directories (although, this is B +recommended). =head2 /etc/group @@ -433,19 +411,12 @@ see entries that use the members field, otherwise this test will fail: ------------------------------------ op/grent.t 1 -=head2 Unexplained Failures - -Any additional tests that fail are likely due to bugs in Cygwin or the -optional libraries. It is expected that by the time of the next net -release most of these will be solved so they are not described here. - =head2 Script Portability -Cygwin does an outstanding job of providing UNIX-like semantics on -top of Win32 systems. However, in addition to the items noted above, -there are some differences that you should know about. This is only a -very brief guide to portability, more information can be found in the -Cygwin documentation. +Cygwin does an outstanding job of providing UNIX-like semantics on top of +Win32 systems. However, in addition to the items noted above, there are +some differences that you should know about. This is a very brief guide +to portability, more information can be found in the Cygwin documentation. =over 4 @@ -454,20 +425,13 @@ Cygwin documentation. Cygwin pathnames can be separated by forward (F) or backward (F<\>) slashes. They may also begin with drive letters (F) or Universal Naming Codes (F). DOS device names (F, F, F, -F, F) are invalid as base filenames. However, they can be -used in extensions (e.g., F). Names may not contain these -characters: +F, F, F) are invalid as base filenames. However, they +can be used in extensions (e.g., F). Names may contain all +printable characters except these: : * ? " < > | -File names are case insensitive, but case preserving. With the I -C setting, file names are mixed-case (although, directory names -remain case insensitive). - -The I setting is only available with the "coolview" version of -F provided by Sergey Okhapkin at: - - ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/porters/Okhapkin_Sergey/ +File names are case insensitive, but case preserving. =item * Text/Binary @@ -487,22 +451,17 @@ The text/binary issue is covered at length in the Cygwin documentation. =item * F<.exe> The Cygwin stat() makes the F<.exe> extension transparent by looking for -a F when you ask for F (unless a F also exists). -Cygwin does not require a F<.exe> extension, but I adds it -automatically when building a program. However, when accessing an -executable as a normal file (e.g., I or I in a makefile) -the F<.exe> is not transparent. - -NOTE: There is a version of I that understands the F<.exe> -semantics, it can be found at: - - ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/porters/Humblet_Pierre_A/ +F when you ask for F (unless a F also exists). Cygwin +does not require a F<.exe> extension, but I adds it automatically +when building a program. However, when accessing an executable as a +normal file (e.g., I in a makefile) the F<.exe> is not transparent. +The I included with Cygwin automatically appends a F<.exe> +when necessary. =item * chown() -On WinNT with the I C setting, chown() can change a file's -user and group IDs. In all other configurations chown() is a no-op, -although this is appropriate on Win9x since there is no security model. +On WinNT chown() can change a file's user and group IDs. On Win9x chown() +is a no-op, although this is appropriate since there is no security model. =item * Miscellaneous @@ -515,7 +474,7 @@ Win9x can not rename() an open file (although WinNT can). =head1 INSTALL -This will install Perl, including man pages. +This will install Perl, including I pages. make install | tee log.make-install @@ -543,7 +502,7 @@ be kept as clean as possible. Changes Changes5.005 Changes5.004 AUTHORS MAINTAIN MANIFEST README.win32 pod/perl.pod pod/perlfaq3.pod pod/perlhist.pod pod/perlmodlib.pod - pod/perlport.pod pod/perltoc.pod pod/perl5004delta.pod + pod/perlport.pod pod/perltoc.pod pod/perldelta.pod pod/perl5004delta.pod =item Build, Configure, Make, Install @@ -575,11 +534,11 @@ be kept as clean as possible. EXTERN.h - __declspec(dllimport) XSUB.h - __declspec(dllexport) - cygwin/cygwin.c - os_extras (getcwd) + cygwin/cygwin.c - os_extras (getcwd, spawn) perl.c - os_extras perl.h - binmode doio.c - win9x can not rename a file when it is open - pp_sys.c - do not define h_errno + pp_sys.c - do not define h_errno, pp_system with spawn mg.c - environ WORKAROUND unixish.h - environ WORKAROUND util.c - environ WORKAROUND @@ -608,24 +567,23 @@ be kept as clean as possible. =head1 BUGS -Upon each start, I warns that a rule for F is overridden -(but there seems to be no better solution than adding an explicit define). +When I starts, it warns about overriding commands for F. `C' does not remove library F<.def> and F<.exe.stackdump> files. The I script contains references to the source directory. You should -change these to C (or whatever) after install. +change these to $installbin after `C'. =head1 AUTHORS -Charles Wilson Ecwilson@ece.gatech.eduE, -Eric Fifer Eefifer@sanwaint.comE, -alexander smishlajev Eals@turnhere.comE, -Steven Morlock Enewspost@morlock.netE, -Sebastien Barre ESebastien.Barre@utc.frE, -Teun Burgers Eburgers@ecn.nlE. +Charles Wilson , +Eric Fifer , +alexander smishlajev , +Steven Morlock , +Sebastien Barre , +Teun Burgers . =head1 HISTORY -Last updated: 1 March 2000 +Last updated: 5 May 2000 diff --git a/cygwin/Makefile.SHs b/cygwin/Makefile.SHs index df15826..ca083d4 100644 --- a/cygwin/Makefile.SHs +++ b/cygwin/Makefile.SHs @@ -159,9 +159,6 @@ esac # $spitshell >>Makefile <<'!NO!SUBS!' -opmini$(OBJ_EXT) : op.c - $(CCCMD) $(PLDLFLAGS) -DPERL_EXTERNAL_GLOB -o opmini$(OBJ_EXT) op.c - perl: $& perlmain$(OBJ_EXT) $(LIBPERL)$(LIB_EXT) $(DYNALOADER) $(static_ext) ext.libs $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) diff --git a/cygwin/cygwin.c b/cygwin/cygwin.c index bece81b..db1c426 100644 --- a/cygwin/cygwin.c +++ b/cygwin/cygwin.c @@ -8,7 +8,134 @@ #include "XSUB.h" #include +#include +/* + * pp_system() implemented via spawn() + * - more efficient and useful when embedding Perl in non-Cygwin apps + * - code mostly borrowed from djgpp.c + */ +static int +do_spawnvp (const char *path, const char * const *argv) +{ + dTHXo; + Sigsave_t ihand,qhand; + int childpid, result, status; + + rsignal_save(SIGINT, SIG_IGN, &ihand); + rsignal_save(SIGQUIT, SIG_IGN, &qhand); + childpid = spawnvp(_P_NOWAIT,path,argv); + if (childpid < 0) { + status = -1; + if(ckWARN(WARN_EXEC)) { + dTHR; + Perl_warner(aTHX_ WARN_EXEC,"Can't spawn \"%s\": %s", + path,Strerror (errno)); + } + } else { + do { + result = wait4pid(childpid, &status, 0); + } while (result == -1 && errno == EINTR); + if(result < 0) + status = -1; + } + (void)rsignal_restore(SIGINT, &ihand); + (void)rsignal_restore(SIGQUIT, &qhand); + return status; +} + +int +do_aspawn (SV *really, void **mark, void **sp) +{ + dTHXo; + int rc; + char **a,*tmps,**argv; + STRLEN n_a; + + if (sp<=mark) + return -1; + a=argv=(char**) alloca ((sp-mark+3)*sizeof (char*)); + + while (++mark <= sp) + if (*mark) + *a++ = SvPVx(*mark, n_a); + else + *a++ = ""; + *a = Nullch; + + if (argv[0][0] != '/' && argv[0][0] != '\\' + && !(argv[0][0] && argv[0][1] == ':' + && (argv[0][2] == '/' || argv[0][2] != '\\')) + ) /* will swawnvp use PATH? */ + TAINT_ENV(); /* testing IFS here is overkill, probably */ + + if (really && *(tmps = SvPV(really, n_a))) + rc=do_spawnvp (tmps,(const char * const *)argv); + else + rc=do_spawnvp (argv[0],(const char *const *)argv); + + return rc; +} + +int +do_spawn (char *cmd) +{ + dTHXo; + char **a,*s,*metachars = "$&*(){}[]'\";\\?>|<~`\n"; + const char *command[4]; + + while (*cmd && isSPACE(*cmd)) + cmd++; + + if (strnEQ (cmd,"/bin/sh",7) && isSPACE (cmd[7])) + cmd+=5; + + /* save an extra exec if possible */ + /* see if there are shell metacharacters in it */ + if (strstr (cmd,"...")) + goto doshell; + if (*cmd=='.' && isSPACE (cmd[1])) + goto doshell; + if (strnEQ (cmd,"exec",4) && isSPACE (cmd[4])) + goto doshell; + for (s=cmd; *s && isALPHA (*s); s++) ; /* catch VAR=val gizmo */ + if (*s=='=') + goto doshell; + + for (s=cmd; *s; s++) + if (strchr (metachars,*s)) + { + if (*s=='\n' && s[1]=='\0') + { + *s='\0'; + break; + } + doshell: + command[0] = "sh"; + command[1] = "-c"; + command[2] = cmd; + command[3] = NULL; + + return do_spawnvp("sh",command); + } + + New (1303,PL_Argv,(s-cmd)/2+2,char*); + PL_Cmd=savepvn (cmd,s-cmd); + a=PL_Argv; + for (s=PL_Cmd; *s;) { + while (*s && isSPACE (*s)) s++; + if (*s) + *(a++)=s; + while (*s && !isSPACE (*s)) s++; + if (*s) + *s++='\0'; + } + *a=Nullch; + if (!PL_Argv[0]) + return -1; + + return do_spawnvp(PL_Argv[0],(const char * const *)PL_Argv); +} /* see also Cwd.pm */ static @@ -19,7 +146,7 @@ XS(Cygwin_cwd) if(items != 0) Perl_croak(aTHX_ "Usage: Cwd::cwd()"); - if(cwd = getcwd(NULL, 0)) { + if((cwd = getcwd(NULL, 0))) { ST(0) = sv_2mortal(newSVpv(cwd, 0)); safesysfree(cwd); XSRETURN(1); diff --git a/hints/cygwin.sh b/hints/cygwin.sh index 42114c2..47c2092 100644 --- a/hints/cygwin.sh +++ b/hints/cygwin.sh @@ -22,6 +22,7 @@ so='dll' # - eliminate -lc, implied by gcc libswanted=`echo " $libswanted " | sed -e 's/ c / /g'` libswanted="$libswanted cygipc cygwin kernel32" +test -z "$optimize" && optimize='-O2' # - otherwise i686-cygwin archname='cygwin' @@ -36,8 +37,6 @@ bincompat5005='undef' # stubs (ENOSYS, not implemented) d_chroot='undef' -d_seteuid='undef' -d_setegid='undef' # Win9x problem with non-blocking read from a closed pipe d_eofnblk='define' diff --git a/pp_sys.c b/pp_sys.c index b661a88..9ea67e1 100644 --- a/pp_sys.c +++ b/pp_sys.c @@ -3744,7 +3744,7 @@ PP(pp_system) } } PERL_FLUSHALL_FOR_CHILD; -#if (defined(HAS_FORK) || defined(AMIGAOS)) && !defined(VMS) && !defined(OS2) +#if (defined(HAS_FORK) || defined(AMIGAOS)) && !defined(VMS) && !defined(OS2) && !defined(__CYGWIN__) if (PerlProc_pipe(pp) >= 0) did_pipes = 1; while ((childpid = vfork()) == -1) {