Fix output-delay and input-mode line combination bug

yabu76 · yabu76 · commit 0dddece8fb87 · 2025-09-20T10:56:11.000+09:00
diff --git a/src/tty.c b/src/tty.c
@@ -257,22 +257,23 @@ ssize_t tty_write(int fd, const void *buffer, size_t count)
 {
     ssize_t retval = 0, bytes_written = 0;
     size_t i;
+    unsigned char *cbuf = (unsigned char *)buffer;
 
     if (option.map_o_ltu)
     {
         // Convert lower case to upper case
-        for (i = 0; i<count; i++)
+        for (i = 0; i < count; i++)
         {
-            *((unsigned char*)buffer+i) = toupper(*((unsigned char*)buffer+i));
+            cbuf[i] = toupper(cbuf[i]);
         }
     }
 
     if (option.output_delay || option.output_line_delay)
     {
         // Write byte by byte with output delay
-        for (i=0; i<count; i++)
+        for (i = 0; i < count; i++)
         {
-            retval = write(fd, buffer, 1);
+            retval = write(fd, &cbuf[i], 1);
             if (retval < 0)
             {
                 // Error
@@ -284,7 +285,7 @@ ssize_t tty_write(int fd, const void *buffer, size_t count)
             fsync(fd);
             tcdrain(fd);
 
-            if (option.output_line_delay && *(unsigned char*)buffer == '\n')
+            if (option.output_line_delay && cbuf[i] == '\n')
             {
                 delay(option.output_line_delay);
             }

Original file line number	Diff line number	Diff line change
`@@ -257,22 +257,23 @@ ssize_t tty_write(int fd, const void *buffer, size_t count)`
`257`	`257`	`{`
`258`	`258`	`ssize_t retval = 0, bytes_written = 0;`
`259`	`259`	`size_t i;`
	`260`	`+ unsigned char cbuf = (unsigned char )buffer;`
`260`	`261`
`261`	`262`	`if (option.map_o_ltu)`
`262`	`263`	`{`
`263`	`264`	`// Convert lower case to upper case`
`264`		`- for (i = 0; i<count; i++)`
	`265`	`+ for (i = 0; i < count; i++)`
`265`	`266`	`{`
`266`		`- ((unsigned char)buffer+i) = toupper(((unsigned char)buffer+i));`
	`267`	`+ cbuf[i] = toupper(cbuf[i]);`
`267`	`268`	`}`
`268`	`269`	`}`
`269`	`270`
`270`	`271`	`if (option.output_delay \|\| option.output_line_delay)`
`271`	`272`	`{`
`272`	`273`	`// Write byte by byte with output delay`
`273`		`- for (i=0; i<count; i++)`
	`274`	`+ for (i = 0; i < count; i++)`
`274`	`275`	`{`
`275`		`- retval = write(fd, buffer, 1);`
	`276`	`+ retval = write(fd, &cbuf[i], 1);`
`276`	`277`	`if (retval < 0)`
`277`	`278`	`{`
`278`	`279`	`// Error`
`@@ -284,7 +285,7 @@ ssize_t tty_write(int fd, const void *buffer, size_t count)`
`284`	`285`	`fsync(fd);`
`285`	`286`	`tcdrain(fd);`
`286`	`287`
`287`		`- if (option.output_line_delay && (unsigned char)buffer == '\n')`
	`288`	`+ if (option.output_line_delay && cbuf[i] == '\n')`
`288`	`289`	`{`
`289`	`290`	`delay(option.output_line_delay);`
`290`	`291`	`}`