Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: runtime/bin/stdio.cc

Issue 851253002: Reapply revert of "Make stdout/stderr async" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Changes to fix build-bot failures Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/stdio.h ('k') | runtime/bin/stdio_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/stdio.cc
diff --git a/runtime/bin/stdio.cc b/runtime/bin/stdio.cc
index ab3b8a2f4489c439165fda7423a48a9f7bb34454..f0dc923d2d4c9e53fc064b7bb0974eab4ebd54be 100644
--- a/runtime/bin/stdio.cc
+++ b/runtime/bin/stdio.cc
@@ -45,8 +45,20 @@ void FUNCTION_NAME(Stdin_SetLineMode)(Dart_NativeArguments args) {
void FUNCTION_NAME(Stdout_GetTerminalSize)(Dart_NativeArguments args) {
+ if (!Dart_IsInteger(Dart_GetNativeArgument(args, 0))) {
+ OSError os_error(-1, "Invalid argument", OSError::kUnknown);
+ Dart_Handle err = DartUtils::NewDartOSError(&os_error);
+ if (Dart_IsError(err)) Dart_PropagateError(err);
+ Dart_SetReturnValue(args, err);
+ return;
+ }
+ intptr_t fd = DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 0));
+ if (fd != 1 && fd != 2) {
+ Dart_PropagateError(Dart_NewApiError("Terminal fd must be 1 or 2"));
+ }
+
int size[2];
- if (Stdout::GetTerminalSize(size)) {
+ if (Stdout::GetTerminalSize(fd, size)) {
Dart_Handle list = Dart_NewList(2);
Dart_ListSetAt(list, 0, Dart_NewInteger(size[0]));
Dart_ListSetAt(list, 1, Dart_NewInteger(size[1]));
« no previous file with comments | « runtime/bin/stdio.h ('k') | runtime/bin/stdio_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698