diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-19 09:48:17 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-19 09:48:17 +0000 |
| commit | 5e25ddb7d369b6785ec3aaa96cbc0521c22aeb0d (patch) | |
| tree | 44b7cf5fb706b0816dd4525782ca8c37d07c2f43 /shell | |
| parent | 636a1f85e89432601c59cdc3239fc867b4adf051 (diff) | |
| download | busybox-w32-5e25ddb7d369b6785ec3aaa96cbc0521c22aeb0d.tar.gz busybox-w32-5e25ddb7d369b6785ec3aaa96cbc0521c22aeb0d.tar.bz2 busybox-w32-5e25ddb7d369b6785ec3aaa96cbc0521c22aeb0d.zip | |
- use STD*_FILENO some more. No object-code changes
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 2 | ||||
| -rw-r--r-- | shell/msh.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shell/ash.c b/shell/ash.c index fa063bf20..20b93f326 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -1258,7 +1258,7 @@ stunalloc(void *p) | |||
| 1258 | { | 1258 | { |
| 1259 | #if DEBUG | 1259 | #if DEBUG |
| 1260 | if (!p || (g_stacknxt < (char *)p) || ((char *)p < g_stackp->space)) { | 1260 | if (!p || (g_stacknxt < (char *)p) || ((char *)p < g_stackp->space)) { |
| 1261 | write(2, "stunalloc\n", 10); | 1261 | write(STDERR_FILENO, "stunalloc\n", 10); |
| 1262 | abort(); | 1262 | abort(); |
| 1263 | } | 1263 | } |
| 1264 | #endif | 1264 | #endif |
diff --git a/shell/msh.c b/shell/msh.c index 48fa56eb7..9e06a3bff 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
| @@ -743,7 +743,7 @@ static void print_tree(struct op *head) | |||
| 743 | static void prs(const char *s) | 743 | static void prs(const char *s) |
| 744 | { | 744 | { |
| 745 | if (*s) | 745 | if (*s) |
| 746 | write(2, s, strlen(s)); | 746 | write(STDERR_FILENO, s, strlen(s)); |
| 747 | } | 747 | } |
| 748 | 748 | ||
| 749 | static void prn(unsigned u) | 749 | static void prn(unsigned u) |
| @@ -3384,7 +3384,7 @@ static int doread(struct op *t ATTRIBUTE_UNUSED, char **args) | |||
| 3384 | } | 3384 | } |
| 3385 | for (wp = args + 1; *wp; wp++) { | 3385 | for (wp = args + 1; *wp; wp++) { |
| 3386 | for (cp = global_env.linep; !nl && cp < elinep - 1; cp++) { | 3386 | for (cp = global_env.linep; !nl && cp < elinep - 1; cp++) { |
| 3387 | nb = nonblock_safe_read(0, cp, sizeof(*cp)); | 3387 | nb = nonblock_safe_read(STDIN_FILENO, cp, sizeof(*cp)); |
| 3388 | if (nb != sizeof(*cp)) | 3388 | if (nb != sizeof(*cp)) |
| 3389 | break; | 3389 | break; |
| 3390 | nl = (*cp == '\n'); | 3390 | nl = (*cp == '\n'); |
| @@ -4522,7 +4522,7 @@ static int readc(void) | |||
| 4522 | static void ioecho(char c) | 4522 | static void ioecho(char c) |
| 4523 | { | 4523 | { |
| 4524 | if (FLAG['v']) | 4524 | if (FLAG['v']) |
| 4525 | write(2, &c, sizeof c); | 4525 | write(STDERR_FILENO, &c, sizeof c); |
| 4526 | } | 4526 | } |
| 4527 | 4527 | ||
| 4528 | static void pushio(struct ioarg *argp, int (*fn) (struct ioarg *)) | 4528 | static void pushio(struct ioarg *argp, int (*fn) (struct ioarg *)) |