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

unix/input: Switch to POSIX I/O for history reading/writing.

This commit is contained in:
Paul Sokolovsky 2015-11-16 07:40:20 +02:00
parent f8bc3f6964
commit 79c4ec1102
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
unix/input.c
View File

@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <fcntl.h>
#include "py/mpstate.h" #include "py/mpstate.h"
#include "py/mphal.h" #include "py/mphal.h"
@ -100,14 +101,18 @@ void prompt_read_history(void) {
vstr_t vstr; vstr_t vstr;
vstr_init(&vstr, 50); vstr_init(&vstr, 50);
vstr_printf(&vstr, "%s/.micropython.history", home); vstr_printf(&vstr, "%s/.micropython.history", home);
FILE *fp = fopen(vstr_null_terminated_str(&vstr), "r"); int fd = open(vstr_null_terminated_str(&vstr), O_RDONLY);
if (fp != NULL) { if (fd != -1) {
vstr_reset(&vstr); vstr_reset(&vstr);
for (;;) { for (;;) {
int c = fgetc(fp); char c;
if (c == EOF || c == '\n') { int sz = read(fd, &c, 1);
if (sz < 0) {
break;
}
if (sz == 0 || c == '\n') {
readline_push_history(vstr_null_terminated_str(&vstr)); readline_push_history(vstr_null_terminated_str(&vstr));
if (c == EOF) { if (sz == 0) {
break; break;
} }
vstr_reset(&vstr); vstr_reset(&vstr);
@ -115,7 +120,7 @@ void prompt_read_history(void) {
vstr_add_byte(&vstr, c); vstr_add_byte(&vstr, c);
} }
} }
fclose(fp); close(fd);
} }
vstr_clear(&vstr); vstr_clear(&vstr);
} }
@ -133,16 +138,18 @@ void prompt_write_history(void) {
vstr_t vstr; vstr_t vstr;
vstr_init(&vstr, 50); vstr_init(&vstr, 50);
vstr_printf(&vstr, "%s/.micropython.history", home); vstr_printf(&vstr, "%s/.micropython.history", home);
FILE *fp = fopen(vstr_null_terminated_str(&vstr), "w"); int fd = open(vstr_null_terminated_str(&vstr), O_CREAT | O_TRUNC | O_WRONLY, 0644);
if (fp != NULL) { if (fd != -1) {
for (int i = MP_ARRAY_SIZE(MP_STATE_PORT(readline_hist)) - 1; i >= 0; i--) { for (int i = MP_ARRAY_SIZE(MP_STATE_PORT(readline_hist)) - 1; i >= 0; i--) {
const char *line = MP_STATE_PORT(readline_hist)[i]; const char *line = MP_STATE_PORT(readline_hist)[i];
if (line != NULL) { if (line != NULL) {
fwrite(line, 1, strlen(line), fp); int res;
fputc('\n', fp); res = write(fd, line, strlen(line));
res = write(fd, "\n", 1);
(void)res;
} }
} }
fclose(fp); close(fd);
} }
} }
#elif MICROPY_USE_READLINE == 2 #elif MICROPY_USE_READLINE == 2