docs: update year in libs docs

[thirdparty/util-linux.git] / sys-utils / tunelp.c

diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index c6bdc66e9a2e3f42d92085feb83806772a75c472..b1e7f75df5655f73890d0fd95a2de4028eafe1ef 100644 (file)
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -69,7 +69,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "lp.h"
+#include <linux/lp.h>
+
 #include "nls.h"
 #include "closestream.h"
 #include "strutils.h"
@@ -108,7 +109,6 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -o, --check-status <on|off>  check printer status before printing\n"), out);
        fputs(_(" -C, --careful <on|off>       extra checking to status check\n"), out);
        fputs(_(" -s, --status                 query printer status\n"), out);
-       fputs(_(" -T, --trust-irq <on|off>     make driver to trust irq\n"), out);
        fputs(_(" -r, --reset                  reset the port\n"), out);
        fputs(_(" -q, --print-irq <on|off>     display current irq setting\n"), out);
        fputs(USAGE_SEPARATOR, out);
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(EXIT_LP_BADVAL);
 
@@ -159,9 +159,6 @@ int main(int argc, char **argv)
        show_irq = 1;
        while ((c = getopt_long(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV", longopts, NULL)) != -1) {
                switch (c) {
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        cmds->op = LPSETIRQ;
                        cmds->val = strtol_or_err(optarg, _("argument error"));
@@ -229,20 +226,12 @@ int main(int argc, char **argv)
                        cmds = cmds->next;
                        cmds->next = NULL;
                        break;
-               case 'T':
-                       /* Note: this will do the wrong thing on
-                        * 2.0.36 when compiled under 2.2.x
-                        */
-                       cmds->op = LPTRUSTIRQ;
-                       cmds->val = parse_switch(optarg, _("argument error"), "on", "off", NULL);
-                       cmds->next = xmalloc(sizeof(struct command));
-                       cmds = cmds->next;
-                       cmds->next = NULL;
-                       break;
+
+               case 'h':
+                       usage();
                case 'v':
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }