djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8614 from adafruit/revert-8599-use-utils-stdout-helpers

Browse Source 
Revert "Revert to micropython's version of mp_hal_stdout_tx_strn_cooked"
This commit is contained in:
Dan Halbert 2023-11-15 12:37:41 -05:00 committed by GitHub
commit 4d93849a9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
shared/runtime/stdout_helpers.c
View File

@ -25,6 +25,8 @@
*/
#include <string.h>
#include <unistd.h>
#include "py/mpconfig.h"
#include "py/mphal.h"
/*
@ -33,26 +35,25 @@
* implementation below can be used.
*/
// CIRCUITPY-CHANGE: changes
// Send "cooked" string of given length, where every occurrence of
// LF character is replaced with CR LF ("\n" is converted to "\r\n").
// This is an optimised version to reduce the number of calls made
// to mp_hal_stdout_tx_strn.
// LF character is replaced with CR LF.
void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
const char *last = str;
while (len--) {
if (*str == '\n') {
if (str > last) {
mp_hal_stdout_tx_strn(last, str - last);
bool last_cr = false;
while (len > 0) {
size_t i = 0;
if (str[0] == '\n' && !last_cr) {
mp_hal_stdout_tx_strn("\r", 1);
i = 1;
}
mp_hal_stdout_tx_strn("\r\n", 2);
++str;
last = str;
} else {
++str;
// Lump all characters on the next line together.
while ((last_cr || str[i] != '\n') && i < len) {
last_cr = str[i] == '\r';
i++;
}
}
if (str > last) {
mp_hal_stdout_tx_strn(last, str - last);
mp_hal_stdout_tx_strn(str, i);
str = &str[i];
len -= i;
}
}