1.2.2 release

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

13 files changed, 53 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 6fbf74be01..09d6b22a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 21 18:04:05 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.2.2 (stable) released.
+
+Tue Jan 19 05:01:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
+
+	* array.c (beg_len): round range value too much.
+
 Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.j>
 
 	* hash.c (env_keys): strchr() may return NULL.
diff --git a/array.c b/array.c
index 19fd842b3f..050de2d553 100644
--- a/array.c
+++ b/array.c
@@ -388,12 +388,7 @@ beg_len(range, begp, lenp, len)
     }
 
     *begp = beg;
-    if (beg > len) {
-	*lenp = 0;
-    }
-    else {
-	*lenp = end - beg +1;
-    }
+    *lenp = end - beg + 1;
     return TRUE;
 }
 
diff --git a/configure b/configure
index de6e9dc743..4b887bb2a6 100644
--- a/configure
+++ b/configure
@@ -3442,7 +3442,7 @@ echo "configure:3439: checking whether OS depend dynamic link works" >&5
     openstep*)	;;
     rhapsody*)	;;
     human*)	;;
-    cygwin32*)	CCDLFLAGS=-DDLLIMPORT;;
+    cygwin*)	CCDLFLAGS=-DDLLIMPORT;;
     *) CCDLFLAGS=-fpic;;
     esac
   else
@@ -3509,7 +3509,7 @@ echo "configure:3439: checking whether OS depend dynamic link works" >&5
 			    ;;
 			esac
 			rb_cv_dlopen=yes ;;
-	cygwin32*)	LDSHARED='../../miniruby ../cygwin32_ld.rb' ;;
+	cygwin*)	LDSHARED='../../miniruby ../cygwin32_ld.rb' ;;
 	*) 		LDSHARED='ld' ;;
   esac
   echo "$ac_t""$rb_cv_dlopen" 1>&6
@@ -3592,7 +3592,7 @@ EOF
 #define DLEXT ".bundle"
 EOF
 ;;
-    cygwin32*)	DLEXT=dll
+    cygwin*)	DLEXT=dll
 	 	cat >> confdefs.h <<\EOF
 #define DLEXT ".dll"
 EOF
@@ -3875,7 +3875,7 @@ EOF
     binsuffix=.x
     setup=Setup.x68
     ;;
-  cygwin32*)
+  cygwin*)
     binsuffix=.exe
     setup=Setup
     ;;
diff --git a/configure.bat b/configure.bat
index 093d43549d..bd62a3bffc 100644
--- a/configure.bat
+++ b/configure.bat
@@ -1,6 +1,12 @@
 @echo off
-sed -f top.sed Makefile.in >Makefile
-sed -f top.sed ext/extmk.rb.in > ext\extmk.rb
+sed -f top.sed < Makefile.in > Makefile
+sed -f top.sed < ext/extmk.rb.in > ext\extmk.rb
 copy ext\Setup.dj ext\Setup
 copy config_h.dj config.h
-copy config_s.dj config.status
+if not (%OS%) == (Windows_NT) goto LFN
+    copy missing\vsnprintf.c missing\vsnprint.c
+    copy config_s.dj config.sta
+goto end
+:LFN
+    copy config_s.dj config.status
+:end
diff --git a/configure.in b/configure.in
index 67b634f1c7..8d993eed4d 100644
--- a/configure.in
+++ b/configure.in
@@ -345,7 +345,7 @@ if test "$with_dln_a_out" != yes; then
     openstep*)	;;
     rhapsody*)	;;
     human*)	;;
-    cygwin32*)	CCDLFLAGS=-DDLLIMPORT;;
+    cygwin*)	CCDLFLAGS=-DDLLIMPORT;;
     *) CCDLFLAGS=-fpic;;
     esac
   else
@@ -412,7 +412,7 @@ if test "$with_dln_a_out" != yes; then
 			    ;;
 			esac
 			rb_cv_dlopen=yes ;;
-	cygwin32*)	LDSHARED='../../miniruby ../cygwin32_ld.rb' ;;
+	cygwin*)	LDSHARED='../../miniruby ../cygwin32_ld.rb' ;;
 	*) 		LDSHARED='ld' ;;
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
@@ -458,7 +458,7 @@ else
 	 	AC_DEFINE(DLEXT, ".bundle");;
     rhapsody*)	DLEXT=bundle
 	 	AC_DEFINE(DLEXT, ".bundle");;
-    cygwin32*)	DLEXT=dll
+    cygwin*)	DLEXT=dll
 	 	AC_DEFINE(DLEXT, ".dll");;
     *)		DLEXT=so
     		AC_DEFINE(DLEXT, ".so");;
@@ -542,7 +542,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no)])
     binsuffix=.x
     setup=Setup.x68
     ;;
-  cygwin32*)
+  cygwin*)
     binsuffix=.exe
     setup=Setup
     ;;
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
index a03f358593..5af3243d96 100644
--- a/ext/Win32API/extconf.rb
+++ b/ext/Win32API/extconf.rb
@@ -1,5 +1,5 @@
 case PLATFORM
-when /cygwin32/,/mingw32/
+when /cygwin/,/mingw/
   $CFLAGS = "-fno-defer-pop"
   create_makefile("Win32API")
 when /win32/
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index bb0e042371..fdc90b5abe 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -280,7 +280,7 @@ CC = @CC@
 
 prefix = @prefix@
 CFLAGS   = %s -I#{$topdir} -I#{$top_srcdir} -I@includedir@ %s #$CFLAGS %s
-DLDFLAGS = #$DLDFLAGS #$LDFLAGS
+DLDFLAGS = #$DLDFLAGS @LDFLAGS@ #$LDFLAGS
 LDSHARED = @LDSHARED@
 ", if $static then "" else "@CCDLFLAGS@" end, CFLAGS, $defs.join(" ")
 
diff --git a/missing/setenv.c b/missing/setenv.c
index fa1c65928d..1d24dde1c3 100644
--- a/missing/setenv.c
+++ b/missing/setenv.c
@@ -12,7 +12,10 @@ void *xrealloc ();
 #define ALLOC(type) (type*)xmalloc(sizeof(type))
 #define REALLOC_N(var,type,n) (var)=(type*)xrealloc((char*)(var),sizeof(type)*(n))
 
-#ifndef NT
+#if defined(NT) && defined(_MSC_VER)
+extern char **_environ;
+#define environ _environ
+#else
 extern char **environ;
 #endif
 extern char **origenviron;
diff --git a/parse.y b/parse.y
index bf7ac0317c..8a15186c8a 100644
--- a/parse.y
+++ b/parse.y
@@ -2183,7 +2183,8 @@ here_document(term)
     char *eos;
     int len;
     VALUE str, line;
-    char *save_beg, *save_end, *save_lexp;
+    VALUE lastline_save;
+    int offset_save;
     NODE *list = 0;
     int linesave = sourceline;
 
@@ -2212,9 +2213,8 @@ here_document(term)
 	break;
     }
     tokfix();
-    save_lexp = lex_p;
-    save_beg = lex_pbeg;
-    save_end = lex_pend;
+    lastline_save = lex_lastline;
+    offset_save = lex_p - lex_pbeg;
     eos = strdup(tok());
     len = strlen(eos);
 
@@ -2262,9 +2262,11 @@ here_document(term)
 	}
     }
     free(eos);
-    lex_p = save_lexp;
-    lex_pbeg = save_beg;
-    lex_pend = save_end;
+    lex_lastline = lastline_save;
+    lex_pbeg = RSTRING(lex_lastline)->ptr;
+    lex_pend = lex_pbeg + RSTRING(lex_lastline)->len;
+    lex_p = lex_pbeg + offset_save;
+
     lex_state = EXPR_END;
     heredoc_end = sourceline;
     sourceline = linesave;
diff --git a/ruby.c b/ruby.c
index 9e060c0783..f80873eb1a 100644
--- a/ruby.c
+++ b/ruby.c
@@ -715,10 +715,15 @@ ruby_libpath()
     strcpy(libpath, __dos_argv0);
 #endif
     p = strrchr(libpath, '\\');
-    if (p)
+    if (p) {
 	*p = 0;
-    if (!strcasecmp(p-4, "\\bin"))
-	p -= 4;
+	if (!strcasecmp(p-4, "\\bin"))
+	    p -= 4;
+    } else {
+	strcpy(libpath, ".");
+	p = libpath + 1;
+    }
+
     strcpy(p, "\\lib");
 #if defined(__CYGWIN32__)
     p = (char *)malloc(strlen(libpath)+10);
diff --git a/top.sed b/top.sed
index a9ec12f7b6..bf39bce069 100644
--- a/top.sed
+++ b/top.sed
@@ -55,4 +55,7 @@ s%@archlib@%/usr/local/lib/ruby/i386-djgpp%
 s,/dev/null 2>&1, nul,
 s,2> /dev/null,,
 }
+/^config.status/ {
+    N;N;N;N;N;d
+}
 s%y\.tab\.c%y_tab.c%
diff --git a/version.h b/version.h
index d5e47aa2e5..4a754e9d9e 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
 #define RUBY_VERSION "1.2.2"
-#define VERSION_DATE "99/01/18"
+#define VERSION_DATE "99/01/21"
diff --git a/win32/ruby.def b/win32/ruby.def
index 868b81599d..4124deb7be 100644
--- a/win32/ruby.def
+++ b/win32/ruby.def
@@ -302,7 +302,6 @@ EXPORTS
 	rb_id2name
 	rb_is_const_id
 	rb_is_instance_id
-	local_var_append
 	backref_get
 	backref_set
 	lastline_get
@@ -322,7 +321,6 @@ EXPORTS
 	reg_match_pre
 	reg_match_post
 	reg_match_last
-	reg_free
 	reg_new
 	reg_regcomp
 	reg_match