1.1c2

matz · matz · commit e3e0fede4472 · 1998-08-10T05:41:28.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Aug 10 14:05:30 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* process.c (f_system): removed fflush(stdin).
+
+Fri Aug  7 17:44:44 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* error.c (err_snprintf): replace sprintf for fixed sized buffer,
+ 	  with snprintf to avoid buffer over-run.  For systems which does
+	  dot provide snprintf, missing/snprintf.c added.
+
 Tue Jul 28 13:03:25 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* array.c (ary_s_new): argument to specify initial value is added.
diff --git a/MANIFEST b/MANIFEST
@@ -151,6 +151,7 @@ missing/mkdir.c
 missing/nt.c
 missing/nt.h
 missing/setenv.c
+missing/snprintf.c
 missing/strcasecmp.c
 missing/strchr.c
 missing/strdup.c
diff --git a/Makefile.in b/Makefile.in
@@ -147,6 +147,9 @@ mkdir.o: @srcdir@/missing/mkdir.c
 setenv.o: @srcdir@/missing/setenv.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/setenv.c
 
+snprintf.o: @srcdir@/missing/snprintf.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/snprintf.c
+
 strcasecmp.o: @srcdir@/missing/strcasecmp.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/strcasecmp.c
 
diff --git a/configure b/configure
@@ -2633,7 +2633,7 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 for ac_func in dup2 setenv memmove mkdir strcasecmp strerror strftime\
-		 strchr strstr strtoul strdup crypt flock
+		 strchr strstr strtoul strdup crypt flock snprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:2640: checking for $ac_func" >&5
@@ -3925,12 +3925,15 @@ esac
 
 
 
+
+
+
 if test "$prefix" = NONE; then
   prefix=$ac_default_prefix
 fi
 
 if test "$fat_binary" = yes ; then
-  CFLAGS="$CFLAGS -pipe $ARCH_FLAG"
+  CFLAGS="$CFLAGS $ARCH_FLAG"
 fi
 
 LIBRUBY='libruby.a'
@@ -3958,9 +3961,19 @@ if test "$enable_shared" = 'yes'; then
   LIBRUBYARG='-L./ -lruby'
 fi
 
-if test "$host_os" = "rhapsody" ; then
-    CFLAGS="$CFLAGS -no-precomp"
-fi
+case "$host_os" in
+	nextstep*)
+    	CFLAGS="$CFLAGS -pipe"
+		;;
+	openstep*)
+    	CFLAGS="$CFLAGS -pipe"
+		;;
+	rhasody*)
+    	CFLAGS="$CFLAGS -pipe -no-precomp"
+		;;
+	*)
+		;;	
+esac
 
 
 
diff --git a/configure.in b/configure.in
@@ -159,7 +159,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_VFORK
 AC_FUNC_MEMCMP
 AC_REPLACE_FUNCS(dup2 setenv memmove mkdir strcasecmp strerror strftime\
-		 strchr strstr strtoul strdup crypt flock)
+		 strchr strstr strtoul strdup crypt flock snprintf)
 AC_CHECK_FUNCS(fmod killpg drand48 random wait4 waitpid syscall getcwd\
 	      truncate chsize times utimes fcntl lockf setitimer\
 	      setruid seteuid setreuid setrgid setegid setregid\
diff --git a/error.c b/error.c
@@ -32,16 +32,19 @@ extern int   sourceline;
 int nerrs;
 
 static void
-err_sprintf(buf, fmt, args)
+err_snprintf(buf, len, fmt, args)
     char *buf, *fmt;
+    int len;
     va_list args;
 {
     if (!sourcefile) {
-	vsprintf(buf, fmt, args);
+	vsnprintf(buf, len, fmt, args);
     }
     else {
-	sprintf(buf, "%s:%d: ", sourcefile, sourceline);
-	vsprintf((char*)buf+strlen(buf), fmt, args);
+	int n = snprintf(buf, len, "%s:%d: ", sourcefile, sourceline); 
+	if (len > n) {
+	    vsnprintf((char*)buf+n, len-n, fmt, args);
+	}
     }
 }
 
@@ -53,7 +56,7 @@ err_print(fmt, args)
 {
     char buf[BUFSIZ];
 
-    err_sprintf(buf, fmt, args);
+    err_snprintf(buf, BUFSIZ, fmt, args);
     err_append(buf);
 }
 
@@ -87,7 +90,7 @@ Error_Append(fmt, va_alist)
     char buf[BUFSIZ];
 
     va_init_list(args, fmt);
-    vsprintf(buf, fmt, args);
+    vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
     err_append(buf);
 }
@@ -104,7 +107,7 @@ Warn(fmt, va_alist)
     char buf[BUFSIZ];
     va_list args;
 
-    sprintf(buf, "warning: %s", fmt);
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
     va_init_list(args, fmt);
     err_print(buf, args);
@@ -126,7 +129,7 @@ Warning(fmt, va_alist)
 
     if (!RTEST(verbose)) return;
 
-    sprintf(buf, "warning: %s", fmt);
+    snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
     va_init_list(args, fmt);
     err_print(buf, args);
@@ -145,7 +148,7 @@ Bug(fmt, va_alist)
     char buf[BUFSIZ];
     va_list args;
 
-    sprintf(buf, "[BUG] %s", fmt);
+    snprintf(buf, BUFSIZ, "[BUG] %s", fmt);
     rb_in_eval = 0;
 
     va_init_list(args, fmt);
@@ -566,7 +569,7 @@ Init_Exception()
     va_list args;\
     char buf[BUFSIZ];\
     va_init_list(args,fmt);\
-    vsprintf(buf, fmt, args);\
+    vsnprintf(buf, BUFSIZ, fmt, args);\
     va_end(args);\
     rb_raise(exc_new2(klass, buf));\
 }
@@ -677,7 +680,7 @@ Fatal(fmt, va_alist)
     char buf[BUFSIZ];
 
     va_init_list(args, fmt);
-    vsprintf(buf, fmt, args);
+    vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
 
     rb_in_eval = 0;
@@ -704,7 +707,7 @@ rb_sys_fail(mesg)
     }
     else {
 	buf = ALLOCA_N(char, strlen(err)+1);
-	sprintf(buf, "%s", err);
+	strcpy(buf, err);
     }
 
     errno = 0;
diff --git a/eval.c b/eval.c
@@ -3748,11 +3748,11 @@ backtrace(lev)
     ary = ary_new();
     if (lev < 0) {
 	if (frame->last_func) {
-	    sprintf(buf, "%s:%d:in `%s'", sourcefile, sourceline,
+	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'", sourcefile, sourceline,
 		    rb_id2name(frame->last_func));
 	}
 	else {
-	    sprintf(buf, "%s:%d", sourcefile, sourceline);
+	    snprintf(buf, BUFSIZ, "%s:%d", sourcefile, sourceline);
 	}
 	ary_push(ary, str_new2(buf));
     }
@@ -3764,12 +3764,12 @@ backtrace(lev)
     }
     while (frame && frame->file) {
 	if (frame->prev && frame->prev->last_func) {
-	    sprintf(buf, "%s:%d:in `%s'",
+	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
 		    frame->file, frame->line,
 		    rb_id2name(frame->prev->last_func));
 	}
 	else {
-	    sprintf(buf, "%s:%d", frame->file, frame->line);
+	    snprintf(buf, BUFSIZ, "%s:%d", frame->file, frame->line);
 	}
 	ary_push(ary, str_new2(buf));
 	frame = frame->prev;
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
@@ -11,9 +11,9 @@
   have_library("net", "socket")
 else
   test_func = "socket"
-  have_library("socket", "socket")
   have_library("inet", "gethostbyname")
   have_library("nsl", "gethostbyname")
+  have_library("socket", "socket")
 end
 have_header("sys/un.h")
 if have_func(test_func)
diff --git a/lib/matrix.rb b/lib/matrix.rb
@@ -1,8 +1,8 @@
 #
 #   matrix.rb - 
 #   	$Release Version: 1.0$
-#   	$Revision: 1.5 $
-#   	$Date: 1998/07/14 14:35:18 $
+#   	$Revision: 1.6 $
+#   	$Date: 1998/07/31 03:39:49 $
 #       Original Version from Smalltalk-80 version
 #	   on July 23, 1985 at 8:37:17 am
 #   	by Keiju ISHITSUKA
@@ -179,7 +179,7 @@ module ExceptionForMatrix
 end
 
 class Matrix
-  @RCS_ID='-$Id: matrix.rb,v 1.5 1998/07/14 14:35:18 keiju Exp keiju $-'
+  @RCS_ID='-$Id: matrix.rb,v 1.6 1998/07/31 03:39:49 keiju Exp keiju $-'
 
   include ExceptionForMatrix
   
@@ -361,7 +361,7 @@ def ==(other)
     
     other.compare_by_row_vectors(@rows)
   end
-  alias eqn? ==
+  alias eql? ==
   
   def compare_by_row_vectors(rows)
     return FALSE unless @rows.size == rows.size
@@ -515,7 +515,7 @@ def inverse_from(src)
       end
       
       for i in 0 .. size
-	continue if i == k
+	next if i == k
 	q = a[i][k] / akk
 	a[i][k] = 0
 	
@@ -620,7 +620,7 @@ def rank
 	    break
 	  end
 	end while a[i][k] == 0
-	continue if nothing
+	next if nothing
 	a[i], a[k] = a[k], a[i]
 	akk = a[k][k]
       end
diff --git a/lib/telnet.rb b/lib/telnet.rb
@@ -1,8 +1,24 @@
 #
 # telnet.rb
-# ver0.12 1998/06/01
+# ver0.122 1998/08/05
 # Wakou Aoyama <wakou@fsinet.or.jp>
 #
+# ver0.122 1998/08/05
+# support for HP-UX 10.20    thanks to WATANABE Tetsuya <tetsu@jpn.hp.com>
+# socket.<< --> socket.write
+#
+# ver0.121 1998/07/15
+# string.+= --> string.concat
+#
+# ver0.12 1998/06/01
+# add timeout, waittime.
+#
+# ver0.11 1998/04/21
+# add realtime output.
+#
+# ver0.10 1998/04/13
+# first release.
+#
 # == make new Telnet object
 # host = Telnet.new({"Binmode" => TRUE,              default: TRUE
 #                    "Host" => "localhost",          default: "localhost"
@@ -139,14 +155,14 @@ def initialize(options)
     end
 
     message = "Trying " + @options["Host"] + "...\n"
-    STDOUT << message
-    @log << message if @options.include?("Output_log")
+    STDOUT.write(message)
+    @log.write(message) if @options.include?("Output_log")
 
     is_timeout = timeout(@options["Timeout"]){
       begin
         @sock = TCPsocket.open(@options["Host"], @options["Port"])
       rescue
-        @log << $! << "\n" if @options.include?("Output_log")
+        @log.write($! + "\n") if @options.include?("Output_log")
         raise
       end
     }
@@ -155,8 +171,8 @@ def initialize(options)
     @sock.binmode if @options["Binmode"]
 
     message = "Connected to " + @options["Host"] + ".\n"
-    STDOUT << message
-    @log << message if @options.include?("Output_log")
+    STDOUT.write(message)
+    @log.write(message) if @options.include?("Output_log")
 
     super(@sock)
   end
@@ -166,7 +182,7 @@ def preprocess(str)
 
     # respond to "IAC DO x" or "IAC DON'T x" with "IAC WON'T x"
     str.gsub!(/([^#{IAC}])?#{IAC}[#{DO}#{DONT}](.|\n)/no){
-        @sock << IAC << WONT << $2
+        @sock.write(IAC + WONT + $2)
         $1
     }
 
@@ -175,7 +191,7 @@ def preprocess(str)
 
     # respond to "IAC AYT" (are you there)
     str.gsub!(/([^#{IAC}])?#{IAC}#{AYT}/no){
-        @sock << "nobody here but us pigeons" << CR
+        @sock.write("nobody here but us pigeons" + CR)
         $1
     }
 
@@ -212,7 +228,7 @@ def waitfor(options)
       ensure
         @log.print(buf) if @options.include?("Output_log")
         yield buf if iterator?
-        line += buf
+        line.concat(buf)
       end
     end
     line
@@ -231,7 +247,7 @@ def cmd(options)
     end
 
     select(nil, [@sock])
-    @sock << string.gsub(/\n/, CR) << CR
+    @sock.write(string.gsub(/\n/, CR) + CR)
     if iterator?
       waitfor({"Prompt" => match, "Timeout" => timeout}){|c| yield c }
     else
@@ -249,14 +265,14 @@ def login(options, password = '')
 
     if iterator?
       line = waitfor(/login[: ]*$/){|c| yield c }
-      line += cmd({"String" => username,
-                   "Match" => /Password[: ]*$/}){|c| yield c }
-      line += cmd(password){|c| yield c }
+      line.concat( cmd({"String" => username,
+                        "Match" => /Password[: ]*$/}){|c| yield c } )
+      line.concat( cmd(password){|c| yield c } )
     else
       line = waitfor(/login[: ]*$/)
-      line += cmd({"String" => username,
-                   "Match" => /Password[: ]*$/})
-      line += cmd(password)
+      line.concat( cmd({"String" => username,
+                        "Match" => /Password[: ]*$/}) )
+      line.concat( cmd(password) )
     end
     line
   end
diff --git a/lib/tk.rb b/lib/tk.rb
diff --git a/missing/snprintf.c b/missing/snprintf.c
diff --git a/process.c b/process.c
diff --git a/version.h b/version.h

Original file line number	Diff line number	Diff line change
`@@ -3748,11 +3748,11 @@ backtrace(lev)`
`3748`	`3748`	`ary = ary_new();`
`3749`	`3749`	`if (lev < 0) {`
`3750`	`3750`	`if (frame->last_func) {`
`3751`		- sprintf(buf, "%s:%d:in `%s'", sourcefile, sourceline,
	`3751`	+ snprintf(buf, BUFSIZ, "%s:%d:in `%s'", sourcefile, sourceline,
`3752`	`3752`	`rb_id2name(frame->last_func));`
`3753`	`3753`	`}`
`3754`	`3754`	`else {`
`3755`		`- sprintf(buf, "%s:%d", sourcefile, sourceline);`
	`3755`	`+ snprintf(buf, BUFSIZ, "%s:%d", sourcefile, sourceline);`
`3756`	`3756`	`}`
`3757`	`3757`	`ary_push(ary, str_new2(buf));`
`3758`	`3758`	`}`
`@@ -3764,12 +3764,12 @@ backtrace(lev)`
`3764`	`3764`	`}`
`3765`	`3765`	`while (frame && frame->file) {`
`3766`	`3766`	`if (frame->prev && frame->prev->last_func) {`
`3767`		- sprintf(buf, "%s:%d:in `%s'",
	`3767`	+ snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
`3768`	`3768`	`frame->file, frame->line,`
`3769`	`3769`	`rb_id2name(frame->prev->last_func));`
`3770`	`3770`	`}`
`3771`	`3771`	`else {`
`3772`		`- sprintf(buf, "%s:%d", frame->file, frame->line);`
	`3772`	`+ snprintf(buf, BUFSIZ, "%s:%d", frame->file, frame->line);`
`3773`	`3773`	`}`
`3774`	`3774`	`ary_push(ary, str_new2(buf));`
`3775`	`3775`	`frame = frame->prev;`