aboutsummaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorGravatar Erik Andersen <andersen@codepoet.org>2000-04-19 03:59:10 +0000
committerGravatar Erik Andersen <andersen@codepoet.org>2000-04-19 03:59:10 +0000
commit3fe7f9f20b6562e667ff3c9388a6ce00bd1ba19f (patch)
tree98c78a2d9487f52752ed3057d9dd233be6f65161 /console-tools
parenta3e57ca7008cbaf612675b9de3dd18109f8150de (diff)
downloadbusybox-3fe7f9f20b6562e667ff3c9388a6ce00bd1ba19f.tar.gz
busybox-3fe7f9f20b6562e667ff3c9388a6ce00bd1ba19f.tar.bz2
More minor updates to docs (and making apps behave as the docs
suggest they should) -Erik
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/loadacm.c14
-rw-r--r--console-tools/loadfont.c4
-rw-r--r--console-tools/loadkmap.c23
3 files changed, 25 insertions, 16 deletions
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index 66f79092c..8f6923478 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -7,6 +7,7 @@
* Peter Novodvorsky <petya@logic.ru>
*/
+#include "internal.h"
#include <stdio.h>
#include <stdlib.h>
#include <memory.h>
@@ -21,6 +22,9 @@
#include <sys/ioctl.h>
#include <sys/kd.h>
+static const char loadacm_usage[] = "loadacm\n\n"
+ "Loads an acm from standard input.\n";
+
typedef unsigned short unicode;
static long int ctoi(unsigned char *s, int *is_unicode);
@@ -33,20 +37,24 @@ int loadacm_main(int argc, char **argv)
{
int fd;
+ if (argc>=2 && *argv[1]=='-') {
+ usage(loadacm_usage);
+ }
+
fd = open("/dev/tty", O_RDWR);
if (fd < 0) {
fprintf(stderr, "Error opening /dev/tty1: %s\n", strerror(errno));
- return 1;
+ return( FALSE);
}
if (screen_map_load(fd, stdin)) {
fprintf(stderr, "Error loading acm: %s\n", strerror(errno));
- return 1;
+ return( FALSE);
}
write(fd, "\033(K", 3);
- return 0;
+ return( TRUE);
}
int screen_map_load(int fd, FILE * fp)
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 0f6afecd4..5e1f04d76 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -54,11 +54,11 @@ extern int loadfont_main(int argc, char **argv)
fd = open("/dev/tty0", O_RDWR);
if (fd < 0) {
fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
- return 1;
+ return( FALSE);
}
loadnewfont(fd);
- return 0;
+ return( TRUE);
}
static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index fe533d522..75e52e148 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -29,11 +29,8 @@
#include <sys/ioctl.h>
-static const char loadkmap_usage[] = "loadkmap\n"
- "\n"
-
- "\tLoad a binary keyboard translation table from standard input.\n"
- "\n";
+static const char loadkmap_usage[] = "loadkmap\n\n"
+ "Loads a binary keyboard translation table from standard input.\n";
int loadkmap_main(int argc, char **argv)
@@ -43,28 +40,32 @@ int loadkmap_main(int argc, char **argv)
int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short);
char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap", buff[7];
+ if (argc>=2 && *argv[1]=='-') {
+ usage(loadkmap_usage);
+ }
+
fd = open("/dev/tty0", O_RDWR);
if (fd < 0) {
fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
- return 1;
+ exit(FALSE);
}
read(0, buff, 7);
if (0 != strncmp(buff, magic, 7)) {
fprintf(stderr, "This is not a valid binary keymap.\n");
- return 1;
+ exit(FALSE);
}
if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) {
fprintf(stderr, "Error reading keymap flags: %s\n",
strerror(errno));
- return 1;
+ exit(FALSE);
}
ibuff = (u_short *) malloc(ibuffsz);
if (!ibuff) {
fprintf(stderr, "Out of memory.\n");
- return 1;
+ exit(FALSE);
}
for (i = 0; i < MAX_NR_KEYMAPS; i++) {
@@ -75,7 +76,7 @@ int loadkmap_main(int argc, char **argv)
< 0) {
fprintf(stderr, "Error reading keymap: %s\n",
strerror(errno));
- return 1;
+ exit(FALSE);
}
pos += readsz;
}
@@ -90,5 +91,5 @@ int loadkmap_main(int argc, char **argv)
/* Don't bother to close files. Exit does that
* automagically, so we can save a few bytes */
/* close(fd); */
- return 0;
+ exit(TRUE);
}