Re: [9front] [PATCH] Fix rune size in `acid`

["Matt Carroll" <oholiab@grimmwa.re>]

On Wed May 3, 2023 at 7:54 PM BST, Matt Carroll wrote:
> On Wed May 3, 2023 at 6:54 PM BST,  wrote:
> >
> > why make rsize a variable? seems like you could just directly
> > use sizeof(Rune).
>
> I misremembered sizeof being runtime instead of compile time, I'll fix
> it up and send another patch.

diff 54fdc350d67ae00ee7f63450d178daf8f2095abd uncommitted
--- a/sys/src/cmd/acid/exec.c
+++ b/sys/src/cmd/acid/exec.c
@@ -264,7 +264,6 @@
 	case 'u':
 	case 'o':
 	case 'q':
-	case 'r':
 		r->type = TINT;
 		ret = get2(m, addr, &sval);
 		if (ret < 0)
@@ -286,6 +285,7 @@
 	case 'U':
 	case 'O':
 	case 'Q':
+	case 'r':
 		r->type = TINT;
 		ret = get4(m, addr, &lval);
 		if (ret < 0)
@@ -318,11 +318,11 @@
 		break;
 	case 'R':
 		r->type = TSTRING;
-		for(i = 0; i < sizeof(buf)-2; i += 2) {
-			ret = get1(m, addr, (uchar*)&buf[i], 2);
+		for(i = 0; i < sizeof(buf)-sizeof(Rune); i += sizeof(Rune)) {
+			ret = get1(m, addr, (uchar*)&buf[i], sizeof(Rune));
 			if (ret < 0)
 				error("indir: %r");
-			addr += 2;
+			addr += sizeof(Rune);
 			if(buf[i] == 0 && buf[i+1] == 0)
 				break;
 		}