f99afb5df
Denis Vlasenko
2008-02-24
Subject
lpd: new applet by Vladimir Dronnikov
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.h +1 -0include/usage.h +6 -0libbb/read.c +1 -2printutils/Config.in +6 -0printutils/Kbuild +1 -0printutils/lpr.c +9 -3
include/applets.h+1 -0
| @@ -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_LOGREAD(APPLET(logread, _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_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)) | |
include/usage.h+6 -0
| @@ -2051,6 +2051,12 @@ USE_FEATURE_BRCTL_FANCY("\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" | |
| + | #define lpd_trivial_usage \ |
| + | "SPOOLDIR" |
| + | #define lpd_full_usage \ |
| + | "Example:" \ |
| + | "\n tcpsvd -E localhost 515 lpd /var/spool" |
| + | |
| #define lpq_trivial_usage \ | |
| "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID...] [-fs]" | |
| #define lpq_full_usage \ | |
libbb/read.c+1 -2
| @@ -161,8 +161,7 @@ char *xmalloc_reads(int fd, char *buf) | |
| } | |
| /* nonblock_safe_read() because we are used by e.g. shells */ | |
| if (nonblock_safe_read(fd, p, 1) != 1) { /* EOF/error */ | |
| - | if (p == buf) { |
| - | /* we read nothing [and buf was NULL initially] */ |
| + | if (p == buf) { /* we read nothing */ |
| free(buf); | |
| return NULL; | |
| } | |
printutils/Config.in+6 -0
| @@ -1,5 +1,11 @@ | |
| menu "print support" | |
| + | config LPD |
| + | bool "lpd" |
| + | default n |
| + | help |
| + | lpd is a print spooling daemon. |
| + | |
| config LPR | |
| bool "lpr" | |
| default n | |
printutils/Kbuild+1 -0
| @@ -4,5 +4,6 @@ | |
| lib-y := | |
| + | lib-$(CONFIG_LPD) += lpd.o |
| lib-$(CONFIG_LPR) += lpr.o | |
| lib-$(CONFIG_LPQ) += lpr.o | |
printutils/lpr.c+9 -3
| @@ -19,6 +19,7 @@ | |
| */ | |
| static void get_response_or_say_and_die(const char *errmsg) | |
| { | |
| + | static const char newline = '\n'; |
| char buf = ' '; | |
| fflush(stdout); | |
| @@ -28,8 +29,9 @@ static void get_response_or_say_and_die(const char *errmsg) | |
| // request has failed | |
| bb_error_msg("error while %s. Server said:", errmsg); | |
| 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); | |
| + | safe_write(STDERR_FILENO, &newline, 1); |
| xfunc_die(); | |
| } | |
| } | |
| @@ -190,8 +192,12 @@ int lpqr_main(int argc, char *argv[]) | |
| , remote_filename | |
| ); | |
| // delete possible "\nX\n" patterns | |
| - | while ((c = strchr(controlfile, '\n')) != NULL && c[1] && c[2] == '\n') |
| - | memmove(c, c+2, strlen(c+1)); /* strlen(c+1) == strlen(c+2) + 1 */ |
| + | c = controlfile; |
| + | 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 | |
| if (opts & LPR_V) | |