1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
diff -ur busybox-1.00/shell/ash.c busybox-1.00.plasmaroo/shell/ash.c
--- busybox-1.00/shell/ash.c 2004-08-06 02:49:04.000000000 +0100
+++ busybox-1.00.plasmaroo/shell/ash.c 2004-10-16 20:15:43.023201048 +0100
@@ -12580,17 +12580,33 @@
char *prompt;
const char *ifs;
char *p;
+#if JOBS
+ fd_set set;
+ int timeout;
+ struct timeval timeout_struct;
+ struct termios tty, old_tty;
+#endif
int startword;
int status;
int i;
rflag = 0;
prompt = NULL;
+#if JOBS
+ timeout = 0;
+
+ while ((i = nextopt("p:rt:")) != '\0') {
+#else
while ((i = nextopt("p:r")) != '\0') {
+#endif
if (i == 'p')
prompt = optionarg;
- else
+ else if (i == 'r')
rflag = 1;
+#if JOBS
+ else
+ timeout = atoi(optionarg);
+#endif
}
if (prompt && isatty(0)) {
out2str(prompt);
@@ -12599,11 +12615,53 @@
error("arg count");
if ((ifs = bltinlookup("IFS")) == NULL)
ifs = defifs;
+#if JOBS
+ c = 0;
+#endif
status = 0;
startword = 1;
backslash = 0;
+
STARTSTACKSTR(p);
+#if JOBS
+ if (timeout > 0) {
+ tcgetattr(0, &tty);
+ old_tty = tty;
+
+ /* cfmakeraw(...) disables too much; we just do this instead. */
+ tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
+ tcsetattr(0, TCSANOW, &tty);
+
+ FD_ZERO (&set);
+ FD_SET (0, &set);
+
+ timeout_struct.tv_sec = timeout;
+ timeout_struct.tv_usec = 0;
+
+ i = select (FD_SETSIZE, &set, NULL, NULL, &timeout_struct);
+ if(i == 1)
+ {
+ read(0, &c, 1);
+ if(c == '\n' || c == 4) /* Handle newlines and EOF */
+ i = 0; /* Don't read further... */
+ else
+ STPUTC(c, p); /* Keep reading... */
+ }
+ tcsetattr(0, TCSANOW, &old_tty);
+
+ /* Echo the character so the user knows it was read...
+ Yes, this can be done by setting the ECHO flag, but that
+ echoes ^D and other control characters at this state */
+ if(c != 0)
+ write(1, &c, 1);
+
+ } else
+ i = 1;
+
+ for (;i == 1;) {
+#else
for (;;) {
+#endif
if (read(0, &c, 1) != 1) {
status = 1;
break;
|
GitWeb