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

Side by Side Diff: runtime/bin/stdio_linux.cc

Issue 165723007: Move signal_blocker to platform and use it by default in TEMP_FAILURE_RETRY. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Tiny fix. Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/bin/stdio_android.cc ('k') | runtime/bin/stdio_macos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "platform/globals.h" 5 #include "platform/globals.h"
6 #if defined(TARGET_OS_LINUX) 6 #if defined(TARGET_OS_LINUX)
7 7
8 #include <errno.h> // NOLINT 8 #include <errno.h> // NOLINT
9 #include <sys/ioctl.h> // NOLINT 9 #include <sys/ioctl.h> // NOLINT
10 #include <termios.h> // NOLINT 10 #include <termios.h> // NOLINT
11 11
12 #include "bin/stdio.h" 12 #include "bin/stdio.h"
13 #include "bin/fdutils.h" 13 #include "bin/fdutils.h"
14 #include "bin/signal_blocker.h" 14
15 #include "platform/signal_blocker.h"
15 16
16 17
17 namespace dart { 18 namespace dart {
18 namespace bin { 19 namespace bin {
19 20
20 int Stdin::ReadByte() { 21 int Stdin::ReadByte() {
21 int c = getchar(); 22 int c = NO_RETRY_EXPECTED(getchar());
22 if (c == EOF) { 23 if (c == EOF) {
23 c = -1; 24 c = -1;
24 } 25 }
25 return c; 26 return c;
26 } 27 }
27 28
28 29
29 bool Stdin::GetEchoMode() { 30 bool Stdin::GetEchoMode() {
30 struct termios term; 31 struct termios term;
31 tcgetattr(STDIN_FILENO, &term); 32 VOID_NO_RETRY_EXPECTED(tcgetattr(STDIN_FILENO, &term));
32 return (term.c_lflag & ECHO) != 0; 33 return (term.c_lflag & ECHO) != 0;
33 } 34 }
34 35
35 36
36 void Stdin::SetEchoMode(bool enabled) { 37 void Stdin::SetEchoMode(bool enabled) {
37 struct termios term; 38 struct termios term;
38 tcgetattr(STDIN_FILENO, &term); 39 VOID_NO_RETRY_EXPECTED(tcgetattr(STDIN_FILENO, &term));
39 if (enabled) { 40 if (enabled) {
40 term.c_lflag |= ECHO|ECHONL; 41 term.c_lflag |= ECHO|ECHONL;
41 } else { 42 } else {
42 term.c_lflag &= ~(ECHO|ECHONL); 43 term.c_lflag &= ~(ECHO|ECHONL);
43 } 44 }
44 tcsetattr(STDIN_FILENO, TCSANOW, &term); 45 VOID_NO_RETRY_EXPECTED(tcsetattr(STDIN_FILENO, TCSANOW, &term));
45 } 46 }
46 47
47 48
48 bool Stdin::GetLineMode() { 49 bool Stdin::GetLineMode() {
49 struct termios term; 50 struct termios term;
50 tcgetattr(STDIN_FILENO, &term); 51 VOID_NO_RETRY_EXPECTED(tcgetattr(STDIN_FILENO, &term));
51 return (term.c_lflag & ICANON) != 0; 52 return (term.c_lflag & ICANON) != 0;
52 } 53 }
53 54
54 55
55 void Stdin::SetLineMode(bool enabled) { 56 void Stdin::SetLineMode(bool enabled) {
56 struct termios term; 57 struct termios term;
57 tcgetattr(STDIN_FILENO, &term); 58 VOID_NO_RETRY_EXPECTED(tcgetattr(STDIN_FILENO, &term));
58 if (enabled) { 59 if (enabled) {
59 term.c_lflag |= ICANON; 60 term.c_lflag |= ICANON;
60 } else { 61 } else {
61 term.c_lflag &= ~(ICANON); 62 term.c_lflag &= ~(ICANON);
62 } 63 }
63 tcsetattr(STDIN_FILENO, TCSANOW, &term); 64 VOID_NO_RETRY_EXPECTED(tcsetattr(STDIN_FILENO, TCSANOW, &term));
64 } 65 }
65 66
66 67
67 bool Stdout::GetTerminalSize(int size[2]) { 68 bool Stdout::GetTerminalSize(int size[2]) {
68 struct winsize w; 69 struct winsize w;
69 if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS( 70 if (NO_RETRY_EXPECTED(ioctl(STDOUT_FILENO, TIOCGWINSZ, &w)) == 0 &&
70 ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == 0) &&
71 (w.ws_col != 0 || w.ws_row != 0)) { 71 (w.ws_col != 0 || w.ws_row != 0)) {
72 size[0] = w.ws_col; 72 size[0] = w.ws_col;
73 size[1] = w.ws_row; 73 size[1] = w.ws_row;
74 return true; 74 return true;
75 } 75 }
76 return false; 76 return false;
77 } 77 }
78 78
79 } // namespace bin 79 } // namespace bin
80 } // namespace dart 80 } // namespace dart
81 81
82 #endif // defined(TARGET_OS_LINUX) 82 #endif // defined(TARGET_OS_LINUX)
83 83
OLDNEW
« no previous file with comments | « runtime/bin/stdio_android.cc ('k') | runtime/bin/stdio_macos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698