aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorGravatar Matt Kraai <kraai@debian.org>2000-07-14 23:28:47 +0000
committerGravatar Matt Kraai <kraai@debian.org>2000-07-14 23:28:47 +0000
commit3bd8bd89ee9d0b65bf279e1ecad826a5f2f0a217 (patch)
tree6a217bf17e7c00e98a47f657015535f21b53cedd /console-tools
parent464c5de00d3dfb5f01e866f703d95bbb2bb9443c (diff)
downloadbusybox-3bd8bd89ee9d0b65bf279e1ecad826a5f2f0a217.tar.gz
busybox-3bd8bd89ee9d0b65bf279e1ecad826a5f2f0a217.tar.bz2
Don't use strings directly in calls to usage(). This is in preparation
for their extraction to a separate file.
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/chvt.c15
-rw-r--r--console-tools/deallocvt.c16
2 files changed, 16 insertions, 15 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index c5c86b613..ab0e9218f 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -15,18 +15,19 @@
#define VT_ACTIVATE 0x5606 /* make vt active */
#define VT_WAITACTIVE 0x5607 /* wait for vt active */
+const char chvt_usage[] =
+ "chvt N\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nChanges the foreground virtual terminal to /dev/ttyN\n"
+#endif
+ ;
int chvt_main(int argc, char **argv)
{
int fd, num;
- if ((argc != 2) || (**(argv + 1) == '-')) {
- usage ("chvt N\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nChanges the foreground virtual terminal to /dev/ttyN\n"
-#endif
- );
- }
+ if ((argc != 2) || (**(argv + 1) == '-'))
+ usage (chvt_usage);
fd = get_console_fd("/dev/console");
num = atoi(argv[1]);
if (ioctl(fd, VT_ACTIVATE, num)) {
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 906f3a9fa..042de8649 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -13,19 +13,19 @@
/* From <linux/vt.h> */
#define VT_DISALLOCATE 0x5608 /* free memory associated to vt */
+const char deallocvt_usage[] =
+ "deallocvt N\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+ "\nDeallocate unused virtual terminal /dev/ttyN\n"
+#endif
+ ;
int deallocvt_main(int argc, char *argv[])
{
int fd, num, i;
- if ((argc != 2) || (**(argv + 1) == '-')) {
- usage
- ("deallocvt N\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nDeallocate unused virtual terminal /dev/ttyN\n"
-#endif
- );
- }
+ if ((argc != 2) || (**(argv + 1) == '-'))
+ usage(deallocvt_usage);
fd = get_console_fd("/dev/console");