diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-27 16:59:15 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-11-27 16:59:15 +0000 |
| commit | 8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec (patch) | |
| tree | 4817bcd854907cb2cd905780e54ea24faf1c80c5 /shell | |
| parent | db172fe425634b7d784ae1d5af6d88b96b4e747e (diff) | |
| download | busybox-w32-8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec.tar.gz busybox-w32-8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec.tar.bz2 busybox-w32-8aeacdeb7985d23b2d692fca7f2b77c16fa0a6ec.zip | |
fix remaining survivors of the return(a) cleanup
git-svn-id: svn://busybox.net/trunk/busybox@16692 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 4 | ||||
| -rw-r--r-- | shell/lash.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/shell/ash.c b/shell/ash.c index 0704353f5..3a9998fc0 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -4804,9 +4804,9 @@ exptilde(char *startp, char *p, int flag) | |||
| 4804 | while ((c = *++p) != '\0') { | 4804 | while ((c = *++p) != '\0') { |
| 4805 | switch(c) { | 4805 | switch(c) { |
| 4806 | case CTLESC: | 4806 | case CTLESC: |
| 4807 | return (startp); | 4807 | return startp; |
| 4808 | case CTLQUOTEMARK: | 4808 | case CTLQUOTEMARK: |
| 4809 | return (startp); | 4809 | return startp; |
| 4810 | case ':': | 4810 | case ':': |
| 4811 | if (flag & EXP_VARTILDE) | 4811 | if (flag & EXP_VARTILDE) |
| 4812 | goto done; | 4812 | goto done; |
diff --git a/shell/lash.c b/shell/lash.c index 472cbddb9..3b51e98a9 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
| @@ -380,7 +380,7 @@ static int builtin_export(struct child_prog *child) | |||
| 380 | setlocale(LC_CTYPE, getenv("LC_CTYPE")); | 380 | setlocale(LC_CTYPE, getenv("LC_CTYPE")); |
| 381 | #endif | 381 | #endif |
| 382 | 382 | ||
| 383 | return (res); | 383 | return res; |
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | /* built-in 'read VAR' handler */ | 386 | /* built-in 'read VAR' handler */ |
| @@ -414,7 +414,7 @@ static int builtin_read(struct child_prog *child) | |||
| 414 | else | 414 | else |
| 415 | fgets(string, sizeof(string), stdin); | 415 | fgets(string, sizeof(string), stdin); |
| 416 | 416 | ||
| 417 | return (res); | 417 | return res; |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | /* Built-in '.' handler (read-in and execute commands from file) */ | 420 | /* Built-in '.' handler (read-in and execute commands from file) */ |
| @@ -433,7 +433,7 @@ static int builtin_source(struct child_prog *child) | |||
| 433 | status = busy_loop(input); | 433 | status = busy_loop(input); |
| 434 | fclose(input); | 434 | fclose(input); |
| 435 | llist_pop(&close_me_list); | 435 | llist_pop(&close_me_list); |
| 436 | return (status); | 436 | return status; |
| 437 | } | 437 | } |
| 438 | 438 | ||
| 439 | /* built-in 'unset VAR' handler */ | 439 | /* built-in 'unset VAR' handler */ |
