diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-24 18:44:20 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-24 18:44:20 +0000 |
| commit | 4f82bdb050024b3475f5371a0612b1fb0fc4c09f (patch) | |
| tree | ba0f2f986546c7798553f76c305f052b2b190048 /include | |
| parent | 52feee9b1fc996acb9c2857596bc5c2440644525 (diff) | |
| download | busybox-4f82bdb050024b3475f5371a0612b1fb0fc4c09f.tar.gz | |
lpr,lpq: rework by dronnikov AT gmail.com
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 4 | ||||
| -rw-r--r-- | include/usage.h | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/applets.h b/include/applets.h index f2de31c0b..ffd7afc67 100644 --- a/include/applets.h +++ b/include/applets.h @@ -227,8 +227,8 @@ 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_LPQ(APPLET(lpq, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -USE_LPR(APPLET(lpr, _BB_DIR_USR_BIN, _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)) USE_LSATTR(APPLET(lsattr, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_NEVER)) diff --git a/include/usage.h b/include/usage.h index 11d3e3ad2..c9329b30b 100644 --- a/include/usage.h +++ b/include/usage.h @@ -2052,22 +2052,23 @@ USE_FEATURE_BRCTL_FANCY("\n" \ "losetup -f will show the first loop free loop device\n\n" #define lpq_trivial_usage \ - "[-P lp[@host[:port]]] [-t DELAY] [-d JOBID] [-fs]" + "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID...] [-fs]" #define lpq_full_usage \ "Options:" \ "\n -P lp service to connect to (else uses $PRINTER)" \ - "\n -t Scan the queue every DELAY seconds" \ - "\n -d Delete job" \ + "\n -d Delete jobs" \ "\n -f Force any waiting job to be printed" \ "\n -s Short display" \ #define lpr_trivial_usage \ - "-P lp[@host[:port]] -U USERNAME -J TITLE -Vmh [filenames]" + "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE...]" +/* -C CLASS exists too, not shown. + * CLASS is supposed to be printed on banner page, if one is requested */ #define lpr_full_usage \ "Options:" \ "\n -P lp service to connect to (else uses $PRINTER)"\ - "\n -m Send mail to LOGNAME@HOSTNAME" \ - "\n -h Banner or header for this job" \ + "\n -m Send mail on completion" \ + "\n -h Print banner page too" \ "\n -V Verbose" \ #define ls_trivial_usage \ |