aboutsummaryrefslogtreecommitdiff
path: root/printutils/lpr.c
diff options
context:
space:
mode:
Diffstat (limited to 'printutils/lpr.c')
-rw-r--r--printutils/lpr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/printutils/lpr.c b/printutils/lpr.c
index 7acb6c357..77d1a79a4 100644
--- a/printutils/lpr.c
+++ b/printutils/lpr.c
@@ -167,7 +167,7 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
167 // LPR ------------------------ 167 // LPR ------------------------
168 // 168 //
169 if (opts & LPR_V) 169 if (opts & LPR_V)
170 bb_error_msg("connected to server"); 170 bb_simple_error_msg("connected to server");
171 171
172 job = getpid() % 1000; 172 job = getpid() % 1000;
173 hostname = safe_gethostname(); 173 hostname = safe_gethostname();
@@ -206,7 +206,7 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
206 * Standard lpr works around it by refusing to send such jobs: 206 * Standard lpr works around it by refusing to send such jobs:
207 */ 207 */
208 if (st.st_size == 0) { 208 if (st.st_size == 0) {
209 bb_error_msg("nothing to print"); 209 bb_simple_error_msg("nothing to print");
210 continue; 210 continue;
211 } 211 }
212 212
@@ -246,7 +246,7 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
246 246
247 // send control file 247 // send control file
248 if (opts & LPR_V) 248 if (opts & LPR_V)
249 bb_error_msg("sending control file"); 249 bb_simple_error_msg("sending control file");
250 /* "Acknowledgement processing must occur as usual 250 /* "Acknowledgement processing must occur as usual
251 * after the command is sent." */ 251 * after the command is sent." */
252 cflen = (unsigned)strlen(controlfile); 252 cflen = (unsigned)strlen(controlfile);
@@ -262,12 +262,12 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
262 262
263 // send data file, with name "dfaXXX" 263 // send data file, with name "dfaXXX"
264 if (opts & LPR_V) 264 if (opts & LPR_V)
265 bb_error_msg("sending data file"); 265 bb_simple_error_msg("sending data file");
266 fdprintf(fd, "\x3" "%"OFF_FMT"u d%s\n", st.st_size, remote_filename); 266 fdprintf(fd, "\x3" "%"OFF_FMT"u d%s\n", st.st_size, remote_filename);
267 get_response_or_say_and_die(fd, "sending data file"); 267 get_response_or_say_and_die(fd, "sending data file");
268 if (bb_copyfd_size(dfd, fd, st.st_size) != st.st_size) { 268 if (bb_copyfd_size(dfd, fd, st.st_size) != st.st_size) {
269 // We're screwed. We sent less bytes than we advertised. 269 // We're screwed. We sent less bytes than we advertised.
270 bb_error_msg_and_die("local file changed size?!"); 270 bb_simple_error_msg_and_die("local file changed size?!");
271 } 271 }
272 write(fd, "", 1); // send ACK 272 write(fd, "", 1); // send ACK
273 get_response_or_say_and_die(fd, "sending data file"); 273 get_response_or_say_and_die(fd, "sending data file");
@@ -283,7 +283,7 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
283 283
284 // say job accepted 284 // say job accepted
285 if (opts & LPR_V) 285 if (opts & LPR_V)
286 bb_error_msg("job accepted"); 286 bb_simple_error_msg("job accepted");
287 287
288 // next, please! 288 // next, please!
289 job = (job + 1) % 1000; 289 job = (job + 1) % 1000;