854bb6879
Denys Vlasenko
2015-10-19
Subject
printutils/*: convert to new-style "one file" applets
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.src.h +0 -3printutils/Config.src +0 -18printutils/Kbuild.src +1 -3printutils/lpd.c +9 -0printutils/lpr.c +17 -0
include/applets.src.h+0 -3
| @@ -209,9 +209,6 @@ IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP)) | |
| IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE)) | |
| IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname)) | |
| IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP)) | |
| - | IF_LPD(APPLET(lpd, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| - | IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq)) |
| - | IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr)) |
| IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls)) | |
| IF_LSPCI(APPLET(lspci, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
| IF_LSUSB(APPLET(lsusb, BB_DIR_USR_BIN, BB_SUID_DROP)) | |
printutils/Config.src+0 -18
| @@ -7,22 +7,4 @@ menu "Print Utilities" | |
| INSERT | |
| - | config LPD |
| - | bool "lpd" |
| - | default y |
| - | help |
| - | lpd is a print spooling daemon. |
| - | |
| - | config LPR |
| - | bool "lpr" |
| - | default y |
| - | help |
| - | lpr sends files (or standard input) to a print spooling daemon. |
| - | |
| - | config LPQ |
| - | bool "lpq" |
| - | default y |
| - | help |
| - | lpq is a print spool queue examination and manipulation program. |
| - | |
| endmenu | |
printutils/Kbuild.src+1 -3
| @@ -4,6 +4,4 @@ | |
| lib-y := | |
| - | lib-$(CONFIG_LPD) += lpd.o |
| - | lib-$(CONFIG_LPR) += lpr.o |
| - | lib-$(CONFIG_LPQ) += lpr.o |
| + | INSERT |
printutils/lpd.c+9 -0
| @@ -69,6 +69,15 @@ | |
| * cat ./"$DATAFILE" >/dev/lp0 | |
| * mv -f ./"$DATAFILE" save/ | |
| */ | |
| + | //config:config LPD |
| + | //config: bool "lpd" |
| + | //config: default y |
| + | //config: help |
| + | //config: lpd is a print spooling daemon. |
| + | |
| + | //applet:IF_LPD(APPLET(lpd, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| + | |
| + | //kbuild:lib-$(CONFIG_LPD) += lpd.o |
| //usage:#define lpd_trivial_usage | |
| //usage: "SPOOLDIR [HELPER [ARGS]]" | |
printutils/lpr.c+17 -0
| @@ -11,6 +11,23 @@ | |
| * | |
| * See RFC 1179 for protocol description. | |
| */ | |
| + | //config:config LPR |
| + | //config: bool "lpr" |
| + | //config: default y |
| + | //config: help |
| + | //config: lpr sends files (or standard input) to a print spooling daemon. |
| + | //config: |
| + | //config:config LPQ |
| + | //config: bool "lpq" |
| + | //config: default y |
| + | //config: help |
| + | //config: lpq is a print spool queue examination and manipulation program. |
| + | |
| + | //applet:IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq)) |
| + | //applet:IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr)) |
| + | |
| + | //kbuild:lib-$(CONFIG_LPR) += lpr.o |
| + | //kbuild:lib-$(CONFIG_LPQ) += lpr.o |
| //usage:#define lpr_trivial_usage | |
| //usage: "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE]..." | |