summaryrefslogtreecommitdiff
path: root/dmake/getinp.c
diff options
context:
space:
mode:
authorSander Vesik <svesik@openoffice.org>2004-04-21 13:10:17 +0000
committerSander Vesik <svesik@openoffice.org>2004-04-21 13:10:17 +0000
commitc9f547ff6e79cdc89ec89525dfb383c586e8db34 (patch)
tree92e379f0901a13beca2d2a76720779fb7731deaa /dmake/getinp.c
parent5d2003fe8a73961749dfa88718fa102014272e6a (diff)
INTEGRATION: CWS ooo20040329 (1.4.8); FILE MERGED
2004/04/01 16:24:25 mmeeks 1.4.8.1: #27319
Diffstat (limited to 'dmake/getinp.c')
-rw-r--r--dmake/getinp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/dmake/getinp.c b/dmake/getinp.c
index 2f9f1b7a4c08..03c2b6047ca3 100644
--- a/dmake/getinp.c
+++ b/dmake/getinp.c
@@ -1,4 +1,4 @@
-/* RCS $Id: getinp.c,v 1.4 2004-01-28 13:21:11 hjs Exp $
+/* RCS $Id: getinp.c,v 1.5 2004-04-21 14:10:17 svesik Exp $
--
-- SYNOPSIS
-- Handle reading of input.
@@ -86,8 +86,9 @@ FILE *fil;
while( (p = Rule_tab[ rule_ind++ ]) != NIL(char) )
/* The last test in this if *p != '~', handles the environment
* passing conventions used by MKS to pass arguments. We want to
- * skip those environment entries. */
- if( !Readenv || (Readenv && (strchr(p,'=') != NIL(char)) && *p!='~')){
+ * skip those environment entries. Also CYGWIN likes to export '!'
+ * prefixed environment variables that cause severe pain, axe them too */
+ if( !Readenv || (Readenv && (strchr(p,'=') != NIL(char)) && *p!='~' && *p!='!')){
strcpy( buf, p );
DB_PRINT( "io", ("Returning [%s]", buf) );