Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 15:10:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix #23093 - RStdin.slurp() on Windows ##windows

Browse Source
This commit is contained in:
pancake 2024-07-06 10:26:31 +02:00 committed by GitHub
parent 2c3f0cb757
commit c5c440439d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libr/util/file.c
View File

@ -380,27 +380,32 @@ R_API char *r_stdin_readline(int *sz) {
}
R_API char *r_stdin_slurp(int *sz) {
#if __wasi__
#warning r_stdin_slurp not available for wasi
return NULL;
#elif R2__UNIX__ || R2__WINDOWS__
#if (R2__UNIX__ || R2__WINDOWS__) && !__wasi__
int i, ret, newfd;
if ((newfd = dup (0)) < 0) {
return NULL;
char *buf = NULL;
#if R2__WINDOWS__
int stdinfd = _fileno (stdin);
int omode = _setmode (stdinfd, _O_BINARY);
#else
int stdinfd = fileno (stdin);
#endif
if ((newfd = dup (stdinfd)) < 0) {
goto beach;
}
char *buf = malloc (BS);
buf = malloc (BS);
if (!buf) {
close (newfd);
return NULL;
goto beach;
}
for (i = ret = 0; i >= 0; i += ret) {
char *new = realloc (buf, i + BS);
if (!new) {
free (buf);
return NULL;
char *nbuf = realloc (buf, i + BS);
if (!nbuf) {
R_LOG_WARN ("Realloc fail %d", i + BS);
R_FREE (buf);
goto beach;
}
buf = new;
ret = read (0, buf + i, BS);
buf = nbuf;
ret = read (stdinfd, buf + i, BS);
if (ret < 1) {
break;
}
@ -410,7 +415,7 @@ R_API char *r_stdin_slurp(int *sz) {
R_FREE (buf);
} else {
buf[i] = 0;
dup2 (newfd, 0);
dup2 (newfd, stdinfd);
close (newfd);
}
if (sz) {
@ -419,6 +424,10 @@ R_API char *r_stdin_slurp(int *sz) {
if (!i) {
R_FREE (buf);
}
beach:
#if R2__WINDOWS__
_setmode (_fileno (stdin), omode);
#endif
return buf;
#else
#warning TODO r_stdin_slurp