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

lpd: new applet by Vladimir Dronnikov <dronnikov AT gmail.com>

Browse Source
This commit is contained in:
Denis Vlasenko 2008-02-24 23:32:36 +00:00
parent a2f47358eb
commit f99afb5dff
6 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/applets.h
View File

@ -227,6 +227,7 @@ USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS))
USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname)) USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname))
USE_LOGREAD(APPLET(logread, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_LOGREAD(APPLET(logread, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_LOSETUP(APPLET(losetup, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_LOSETUP(APPLET(losetup, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_LPD(APPLET(lpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_LPQ(APPLET_ODDNAME(lpq, lpqr, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lpq)) USE_LPQ(APPLET_ODDNAME(lpq, lpqr, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lpq))
USE_LPR(APPLET_ODDNAME(lpr, lpqr, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lpr)) USE_LPR(APPLET_ODDNAME(lpr, lpqr, _BB_DIR_USR_BIN, _BB_SUID_NEVER, lpr))
USE_LS(APPLET_NOEXEC(ls, ls, _BB_DIR_BIN, _BB_SUID_NEVER, ls)) USE_LS(APPLET_NOEXEC(ls, ls, _BB_DIR_BIN, _BB_SUID_NEVER, ls))

6
include/usage.h
View File

@ -2051,6 +2051,12 @@ USE_FEATURE_BRCTL_FANCY("\n" \
"with an optional offset (-o 12345). Encryption is not yet supported.\n" \ "with an optional offset (-o 12345). Encryption is not yet supported.\n" \
"losetup -f will show the first loop free loop device\n\n" "losetup -f will show the first loop free loop device\n\n"
#define lpd_trivial_usage \
"SPOOLDIR"
#define lpd_full_usage \
"Example:" \
"\n tcpsvd -E localhost 515 lpd /var/spool"
#define lpq_trivial_usage \ #define lpq_trivial_usage \
"[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID...] [-fs]" "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID...] [-fs]"
#define lpq_full_usage \ #define lpq_full_usage \

3
libbb/read.c
View File

@ -161,8 +161,7 @@ char *xmalloc_reads(int fd, char *buf)
} }
/* nonblock_safe_read() because we are used by e.g. shells */ /* nonblock_safe_read() because we are used by e.g. shells */
if (nonblock_safe_read(fd, p, 1) != 1) { /* EOF/error */ if (nonblock_safe_read(fd, p, 1) != 1) { /* EOF/error */
if (p == buf) { if (p == buf) { /* we read nothing */
/* we read nothing [and buf was NULL initially] */
free(buf); free(buf);
return NULL; return NULL;
} }

6
printutils/Config.in
View File

@ -1,5 +1,11 @@
menu "print support" menu "print support"
config LPD
bool "lpd"
default n
help
lpd is a print spooling daemon.
config LPR config LPR
bool "lpr" bool "lpr"
default n default n

1
printutils/Kbuild
View File

@ -4,5 +4,6 @@
lib-y := lib-y :=
lib-$(CONFIG_LPD) += lpd.o
lib-$(CONFIG_LPR) += lpr.o lib-$(CONFIG_LPR) += lpr.o
lib-$(CONFIG_LPQ) += lpr.o lib-$(CONFIG_LPQ) += lpr.o

12
printutils/lpr.c
View File

@ -19,6 +19,7 @@
*/ */
static void get_response_or_say_and_die(const char *errmsg) static void get_response_or_say_and_die(const char *errmsg)
{ {
static const char newline = '\n';
char buf = ' '; char buf = ' ';
fflush(stdout); fflush(stdout);
@ -28,8 +29,9 @@ static void get_response_or_say_and_die(const char *errmsg)
// request has failed // request has failed
bb_error_msg("error while %s. Server said:", errmsg); bb_error_msg("error while %s. Server said:", errmsg);
safe_write(STDERR_FILENO, &buf, 1); safe_write(STDERR_FILENO, &buf, 1);
logmode = 0; /* no errors from bb_copyfd_eof() */ logmode = 0; /* no error messages from bb_copyfd_eof() pls */
bb_copyfd_eof(STDOUT_FILENO, STDERR_FILENO); bb_copyfd_eof(STDOUT_FILENO, STDERR_FILENO);
safe_write(STDERR_FILENO, &newline, 1);
xfunc_die(); xfunc_die();
} }
} }
@ -190,8 +192,12 @@ int lpqr_main(int argc, char *argv[])
, remote_filename , remote_filename
); );
// delete possible "\nX\n" patterns // delete possible "\nX\n" patterns
while ((c = strchr(controlfile, '\n')) != NULL && c[1] && c[2] == '\n') c = controlfile;
memmove(c, c+2, strlen(c+1)); /* strlen(c+1) == strlen(c+2) + 1 */ while ((c = strchr(c, '\n')) != NULL) {
c++;
while (c[0] && c[1] == '\n')
memmove(c, c+2, strlen(c+1)); /* strlen(c+1) == strlen(c+2) + 1 */
}
// send control file // send control file
if (opts & LPR_V) if (opts & LPR_V)