diff options
Diffstat (limited to 'shell/builtin_read.c')
-rw-r--r-- | shell/builtin_read.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/builtin_read.c b/shell/builtin_read.c index 24cfe08fb..412bcf869 100644 --- a/shell/builtin_read.c +++ b/shell/builtin_read.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "builtin_read.h" | 21 | #include "builtin_read.h" |
22 | 22 | ||
23 | const char* FAST_FUNC | 23 | const char* FAST_FUNC |
24 | builtin_read(void (*setvar)(const char *name, const char *val, int flags), | 24 | shell_builtin_read(void FAST_FUNC (*setvar)(const char *name, const char *val), |
25 | char **argv, | 25 | char **argv, |
26 | const char *ifs, | 26 | const char *ifs, |
27 | int read_flags, | 27 | int read_flags, |
@@ -178,7 +178,7 @@ builtin_read(void (*setvar)(const char *name, const char *val, int flags), | |||
178 | if (argv[1] != NULL && is_ifs) { | 178 | if (argv[1] != NULL && is_ifs) { |
179 | buffer[bufpos] = '\0'; | 179 | buffer[bufpos] = '\0'; |
180 | bufpos = 0; | 180 | bufpos = 0; |
181 | setvar(*argv, buffer, 0); | 181 | setvar(*argv, buffer); |
182 | argv++; | 182 | argv++; |
183 | /* can we skip one non-space ifs char? (2: yes) */ | 183 | /* can we skip one non-space ifs char? (2: yes) */ |
184 | startword = isspace(c) ? 2 : 1; | 184 | startword = isspace(c) ? 2 : 1; |
@@ -195,14 +195,14 @@ builtin_read(void (*setvar)(const char *name, const char *val, int flags), | |||
195 | continue; | 195 | continue; |
196 | buffer[bufpos + 1] = '\0'; | 196 | buffer[bufpos + 1] = '\0'; |
197 | /* Use the remainder as a value for the next variable */ | 197 | /* Use the remainder as a value for the next variable */ |
198 | setvar(*argv, buffer, 0); | 198 | setvar(*argv, buffer); |
199 | /* Set the rest to "" */ | 199 | /* Set the rest to "" */ |
200 | while (*++argv) | 200 | while (*++argv) |
201 | setvar(*argv, "", 0); | 201 | setvar(*argv, ""); |
202 | } else { | 202 | } else { |
203 | /* Note: no $IFS removal */ | 203 | /* Note: no $IFS removal */ |
204 | buffer[bufpos] = '\0'; | 204 | buffer[bufpos] = '\0'; |
205 | setvar("REPLY", buffer, 0); | 205 | setvar("REPLY", buffer); |
206 | } | 206 | } |
207 | 207 | ||
208 | ret: | 208 | ret: |