Patch by Tito, reduce size of deallocvt, also make the usage message

clearer (from N to [N]) and indirectly (through bb_xgetlarg) adds support
for  -h ;-)

diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index b89249b87a1b682199219b21ec0fd86030544bd8..363ecdf12abf906111f9c4a41a7410d66c318452 100644 (file)
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -34,33 +34,23 @@ static const int VT_DISALLOCATE = 0x5608;  /* free memory associated to vt */
 
 int deallocvt_main(int argc, char *argv[])
 {
-       int fd, num = 0;
+       /* num = 0 deallocate all unused consoles */
+       int num = 0;
 
-       if (argc > 2) {
-               bb_show_usage();
-       }
-
-       fd = get_console_fd();
-       
-       /*  num=0  deallocate all unused consoles */
-       if (argc == 1) {
-               goto disallocate_all;
-       }
-
-       num = bb_xgetlarg(argv[1], 10, 0, INT_MAX);
-       switch (num) {
-               case 0:
-                       bb_error_msg("0: illegal VT number");
-                       break;
+       switch(argc)
+       {
+               case 2:
+                       if((num = bb_xgetlarg(argv[1], 10, 0, INT_MAX)) == 0)
+                               bb_error_msg_and_die("0: illegal VT number");
+               /* Falltrough */
                case 1:
-                       bb_error_msg("VT 1 cannot be deallocated");
                        break;
                default:
-disallocate_all:
-                       if (ioctl(fd, VT_DISALLOCATE, num)) {
-                               bb_perror_msg_and_die("VT_DISALLOCATE");
-                       }
-                       return EXIT_SUCCESS;
+                       bb_show_usage();
+       }
+
+       if (ioctl( get_console_fd(), VT_DISALLOCATE, num )) {
+               bb_perror_msg_and_die("VT_DISALLOCATE");
        }
-       return EXIT_FAILURE;
+       return EXIT_SUCCESS;
 }

diff --git a/include/usage.h b/include/usage.h
index b1bc010c7183ba958afc4307882d21e73c82b885..f4897e4c07a1241dcf71cb0d9a16add68a0c89ee 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -324,7 +324,7 @@
        "4+0 records out\n"
 
 #define deallocvt_trivial_usage \
-       "N"
+       "[N]"
 #define deallocvt_full_usage \
         "Deallocate unused virtual terminal /dev/ttyN"
 
@@ -438,6 +438,11 @@
 #define dpkg_deb_example_usage \
        "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
 
+#define dpkg_divert_trivial_usage \
+       "blah"
+#define dpkg_divert_full_usage \
+       "blah blah"
+
 #ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
 #define USAGE_DU_DEFALT_BLOCKSIZE_1k(a) a
 #define USAGE_NOT_DU_DEFALT_BLOCKSIZE_1k(a)