diff options
author | Ron Yorston <rmy@pobox.com> | 2015-10-13 14:45:51 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-10-13 14:45:51 +0100 |
commit | 8e509f11bceeec419abc718300bef7422d1fee4c (patch) | |
tree | fdfbc752ad94102e3613a5d7254f14a93eaf7f56 /printutils | |
parent | 420f5edfe7676fe6e7cddbbf15c04649d096e422 (diff) | |
parent | 4d0c1ea4784c9844f8468d97ca5c26d3c70f9921 (diff) | |
download | busybox-w32-8e509f11bceeec419abc718300bef7422d1fee4c.tar.gz busybox-w32-8e509f11bceeec419abc718300bef7422d1fee4c.tar.bz2 busybox-w32-8e509f11bceeec419abc718300bef7422d1fee4c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'printutils')
-rw-r--r-- | printutils/lpd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/printutils/lpd.c b/printutils/lpd.c index eaf42c08b..c98bbb347 100644 --- a/printutils/lpd.c +++ b/printutils/lpd.c | |||
@@ -200,7 +200,7 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[]) | |||
200 | if (2 != s[0] && 3 != s[0]) | 200 | if (2 != s[0] && 3 != s[0]) |
201 | goto unsupported_cmd; | 201 | goto unsupported_cmd; |
202 | if (spooling & (1 << (s[0]-1))) { | 202 | if (spooling & (1 << (s[0]-1))) { |
203 | printf("Duplicated subcommand\n"); | 203 | puts("Duplicated subcommand"); |
204 | goto err_exit; | 204 | goto err_exit; |
205 | } | 205 | } |
206 | // get filename | 206 | // get filename |
@@ -208,7 +208,7 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[]) | |||
208 | fname = strchr(s, ' '); | 208 | fname = strchr(s, ' '); |
209 | if (!fname) { | 209 | if (!fname) { |
210 | // bad_fname: | 210 | // bad_fname: |
211 | printf("No or bad filename\n"); | 211 | puts("No or bad filename"); |
212 | goto err_exit; | 212 | goto err_exit; |
213 | } | 213 | } |
214 | *fname++ = '\0'; | 214 | *fname++ = '\0'; |
@@ -219,13 +219,13 @@ int lpd_main(int argc UNUSED_PARAM, char *argv[]) | |||
219 | // get length | 219 | // get length |
220 | expected_len = bb_strtou(s + 1, NULL, 10); | 220 | expected_len = bb_strtou(s + 1, NULL, 10); |
221 | if (errno || expected_len < 0) { | 221 | if (errno || expected_len < 0) { |
222 | printf("Bad length\n"); | 222 | puts("Bad length"); |
223 | goto err_exit; | 223 | goto err_exit; |
224 | } | 224 | } |
225 | if (2 == s[0] && expected_len > 16 * 1024) { | 225 | if (2 == s[0] && expected_len > 16 * 1024) { |
226 | // SECURITY: | 226 | // SECURITY: |
227 | // ctrlfile can't be big (we want to read it back later!) | 227 | // ctrlfile can't be big (we want to read it back later!) |
228 | printf("File is too big\n"); | 228 | puts("File is too big"); |
229 | goto err_exit; | 229 | goto err_exit; |
230 | } | 230 | } |
231 | 231 | ||