emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make use of libbb functions bb_xopen, bb_full_read, used #define's

Browse Source 
instead of static consts, avoid xmalloc.
This commit is contained in:
Glenn L McGrath 2003-11-21 09:27:02 +00:00
parent 2cd1eb16ad
commit acbdc47aac
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
console-tools/loadkmap.c
View File

@ -37,43 +37,35 @@ struct kbentry {
unsigned char kb_index; unsigned char kb_index;
unsigned short kb_value; unsigned short kb_value;
}; };
static const int KDSKBENT = 0x4B47; /* sets one entry in translation table */ /* sets one entry in translation table */
#define KDSKBENT 0x4B47
/* From <linux/keyboard.h> */ /* From <linux/keyboard.h> */
static const int NR_KEYS = 128; #define NR_KEYS 128
static const int MAX_NR_KEYMAPS = 256; #define MAX_NR_KEYMAPS 256
int loadkmap_main(int argc, char **argv) int loadkmap_main(int argc, char **argv)
{ {
struct kbentry ke; struct kbentry ke;
u_short *ibuff; int i, j, fd;
int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short); u_short ibuff[NR_KEYS];
char flags[MAX_NR_KEYMAPS], buff[7]; char flags[MAX_NR_KEYMAPS];
char buff[7];
if (argc != 1) if (argc != 1)
bb_show_usage(); bb_show_usage();
fd = open(CURRENT_VC, O_RDWR); fd = bb_xopen(CURRENT_VC, O_RDWR);
if (fd < 0)
bb_perror_msg_and_die("Error opening " CURRENT_VC);
read(0, buff, 7); if ((bb_full_read(0, buff, 7) != 7) || (strncmp(buff, BINARY_KEYMAP_MAGIC, 7) != 0))
if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
bb_error_msg_and_die("This is not a valid binary keymap."); bb_error_msg_and_die("This is not a valid binary keymap.");
if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) if (bb_full_read(0, flags, MAX_NR_KEYMAPS) != MAX_NR_KEYMAPS)
bb_perror_msg_and_die("Error reading keymap flags"); bb_perror_msg_and_die("Error reading keymap flags");
ibuff = (u_short *) xmalloc(ibuffsz);
for (i = 0; i < MAX_NR_KEYMAPS; i++) { for (i = 0; i < MAX_NR_KEYMAPS; i++) {
if (flags[i] == 1) { if (flags[i] == 1) {
pos = 0; bb_full_read(0, ibuff, NR_KEYS * sizeof(u_short));
while (pos < ibuffsz) {
if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) < 0)
bb_perror_msg_and_die("Error reading keymap");
pos += readsz;
}
for (j = 0; j < NR_KEYS; j++) { for (j = 0; j < NR_KEYS; j++) {
ke.kb_index = j; ke.kb_index = j;
ke.kb_table = i; ke.kb_table = i;
@ -82,6 +74,7 @@ int loadkmap_main(int argc, char **argv)
} }
} }
} }
/* Don't bother to close files. Exit does that /* Don't bother to close files. Exit does that
* automagically, so we can save a few bytes */ * automagically, so we can save a few bytes */
/* close(fd); */ /* close(fd); */