[ruby-list:2786] Re: [BUG?] strip

前田です。

On Fri, 11 Apr 97 17:18:55 JST,
Yukihiro Matsumoto <[e-mail]> wrote:

|isspaceとisdigitに限れば問題はこことあと1箇所(pack.c)だけの

他にもちょっとあるみたいです。
一応パッチを。
# gnu-win32だとそのままではコンパイルできないんでしょうか？
# configureの途中のバイトオーダーを調べるあたりで止まってしまう
# のですが。

diff -u ruby-1.0-970411.orig/class.c ruby-1.0-970411/class.c
--- ruby-1.0-970411.orig/class.c	Sun Mar 30 00:59:14 1997
+++ ruby-1.0-970411/class.c	Sat Apr 12 03:45:52 1997
@@ -367,7 +367,7 @@
 	return argc;
     }
 
-    if (isdigit(*p)) {
+    if (isdigit((unsigned char)*p)) {
 	n = *p - '0';
 	if (n > argc)
 	    ArgError("Wrong # of arguments (%d for %d)", argc, n);
@@ -381,7 +381,7 @@
 	goto error;
     }
 
-    if (isdigit(*p)) {
+    if (isdigit((unsigned char)*p)) {
 	n = i + *p - '0';
 	for (; i<n; i++) {
 	    var = va_arg(vargs, VALUE*);
diff -u ruby-1.0-970411.orig/dln.c ruby-1.0-970411/dln.c
--- ruby-1.0-970411.orig/dln.c	Wed Apr  9 19:06:57 1997
+++ ruby-1.0-970411/dln.c	Sat Apr 12 03:46:48 1997
@@ -1139,7 +1139,7 @@
 	    if (nerr == load_errtab[i].errno && load_errtab[i].errstr)
 		ERRBUF_APPEND(load_errtab[i].errstr);
 	}
-	while (isdigit(*message[i])) message[i]++ ; 
+	while (isdigit((unsigned char)*message[i])) message[i]++ ; 
 	ERRBUF_APPEND(message[i]);
 	ERRBUF_APPEND("\n");
     }
Common subdirectories: ruby-1.0-970411.orig/ext and ruby-1.0-970411/ext
Common subdirectories: ruby-1.0-970411.orig/lib and ruby-1.0-970411/lib
Common subdirectories: ruby-1.0-970411.orig/missing and ruby-1.0-970411/missing
diff -u ruby-1.0-970411.orig/pack.c ruby-1.0-970411/pack.c
--- ruby-1.0-970411.orig/pack.c	Fri Apr 11 17:18:56 1997
+++ ruby-1.0-970411/pack.c	Sat Apr 12 03:37:31 1997
@@ -114,7 +114,7 @@
 	    len = strchr("@Xxu", type) ? 0 : items;
             p++;
 	}
-	else if (isdigit(*p)) {
+	else if (isdigit((unsigned char)*p)) {
 	    len = strtoul(p, &p, 10);
 	}
 	else {
@@ -525,7 +525,7 @@
 	    len = send - s;
 	    p++;
 	}
-	else if (isdigit(*p)) {
+	else if (isdigit((unsigned char)*p)) {
 	    len = strtoul(p, &p, 10);
 	}
 	else {
diff -u ruby-1.0-970411.orig/ruby.c ruby-1.0-970411/ruby.c
--- ruby-1.0-970411.orig/ruby.c	Fri Apr 11 17:02:21 1997
+++ ruby-1.0-970411/ruby.c	Sat Apr 12 03:27:34 1997
@@ -417,7 +417,7 @@
 		    unsigned char *s;
 
 		    s = RSTRING(line)->ptr;
-		    while (isspace(*s++))
+		    while (isspace((unsigned char)*s++))
 			;
 		    *s = '\0';
 		    RSTRING(line)->ptr[RSTRING(line)->len-1] = '\0';
Common subdirectories: ruby-1.0-970411.orig/sample and ruby-1.0-970411/sample
diff -u ruby-1.0-970411.orig/sprintf.c ruby-1.0-970411/sprintf.c
--- ruby-1.0-970411.orig/sprintf.c	Mon Mar 17 17:51:00 1997
+++ ruby-1.0-970411/sprintf.c	Sat Apr 12 03:47:23 1997
@@ -194,7 +194,7 @@
 	  case '5': case '6': case '7': case '8': case '9':
 	    flags |= FWIDTH;
 	    width = 0;
-	    for (; p < end && isdigit(*p); p++) {
+	    for (; p < end && isdigit((unsigned char)*p); p++) {
 		width = 10 * width + (*p - '0');
 	    }
 	    if (p >= end) {
@@ -234,7 +234,7 @@
 		goto retry;
 	    }
 
-	    for (; p < end && isdigit(*p); p++) {
+	    for (; p < end && isdigit((unsigned char)*p); p++) {
 		prec = 10 * prec + (*p - '0');
 	    }
 	    if (p >= end) {
diff -u ruby-1.0-970411.orig/string.c ruby-1.0-970411/string.c
--- ruby-1.0-970411.orig/string.c	Fri Apr 11 17:58:30 1997
+++ ruby-1.0-970411/string.c	Sat Apr 12 03:26:59 1997
@@ -1724,7 +1724,7 @@
 
 	    for (end = beg = 0; ptr<eptr; ptr++) {
 		if (skip) {
-		    if (isspace(*ptr)) {
+		    if (isspace((unsigned char)*ptr)) {
 			beg++;
 		    }
 		    else {
@@ -1733,7 +1733,7 @@
 		    }
 		}
 		else {
-		    if (isspace(*ptr)) {
+		    if (isspace((unsigned char)*ptr)) {
 			ary_push(result, str_substr(str, beg, end-beg));
 			skip = 1;
 			beg = end + 1;