emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lpr: small code shrink

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-04-27 15:03:34 +02:00
parent deee356a62
commit 0c62f20454
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
printutils/lpr.c
View File

@ -212,12 +212,9 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
); );
// delete possible "\nX\n" patterns // delete possible "\nX\n" patterns
c = controlfile; c = controlfile;
cflen = (unsigned)strlen(controlfile);
while ((c = strchr(c, '\n')) != NULL) { while ((c = strchr(c, '\n')) != NULL) {
if (c[1] && c[2] == '\n') { if (c[1] && c[2] == '\n') {
/* can't use strcpy, results are undefined */ overlapping_strcpy(c, c+2);
memmove(c, c+2, cflen - (c-controlfile) - 1);
cflen -= 2;
} else { } else {
c++; c++;
} }
@ -228,6 +225,7 @@ int lpqr_main(int argc UNUSED_PARAM, char *argv[])
bb_error_msg("sending control file"); bb_error_msg("sending control file");
/* "Acknowledgement processing must occur as usual /* "Acknowledgement processing must occur as usual
* after the command is sent." */ * after the command is sent." */
cflen = (unsigned)strlen(controlfile);
fdprintf(fd, "\x2" "%u c%s\n", cflen, remote_filename); fdprintf(fd, "\x2" "%u c%s\n", cflen, remote_filename);
get_response_or_say_and_die(fd, "sending control file"); get_response_or_say_and_die(fd, "sending control file");
/* "Once all of the contents have /* "Once all of the contents have