Some formatting updates (ran the code through indent)
-Erik
diff --git a/loadkmap.c b/loadkmap.c
index a228ca4..aa4f6bb 100644
--- a/loadkmap.c
+++ b/loadkmap.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* Mini loadkmap implementation for busybox
*
@@ -29,61 +30,63 @@
static const char loadkmap_usage[] = "loadkmap\n"
-"\n"
-"\tLoad a binary keyboard translation table from standard input.\n"
-"\n";
+ "\n"
+
+ "\tLoad a binary keyboard translation table from standard input.\n"
+ "\n";
-int
-loadkmap_main(int argc, char * * argv)
-{
- struct kbentry ke;
- u_short *ibuff;
- int i,j,fd,readsz,pos,ibuffsz=NR_KEYS * sizeof(u_short);
- char flags[MAX_NR_KEYMAPS],magic[]="bkeymap",buff[7];
+int loadkmap_main(int argc, char **argv)
+{
+ struct kbentry ke;
+ u_short *ibuff;
+ int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short);
+ char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap", buff[7];
- fd = open("/dev/tty0", O_RDWR);
- if (fd < 0) {
- fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
- return 1;
- }
-
- read(0,buff,7);
- if (0 != strncmp(buff,magic,7)) {
- fprintf(stderr, "This is not a valid binary keymap.\n");
- return 1;
- }
-
- if ( MAX_NR_KEYMAPS != read(0,flags,MAX_NR_KEYMAPS) ) {
- fprintf(stderr, "Error reading keymap flags: %s\n", strerror(errno));
- return 1;
- }
-
- ibuff=(u_short *) malloc(ibuffsz);
- if (!ibuff) {
- fprintf(stderr, "Out of memory.\n");
- return 1;
- }
-
- for(i=0; i<MAX_NR_KEYMAPS; i++) {
- if (flags[i]==1){
- pos=0;
- while (pos < ibuffsz) {
- if ( (readsz = read(0,(char *)ibuff+pos,ibuffsz-pos)) < 0 ) {
- fprintf(stderr, "Error reading keymap: %s\n",
- strerror(errno));
- return 1;
- }
- pos += readsz;
- }
- for(j=0; j<NR_KEYS; j++) {
- ke.kb_index = j;
- ke.kb_table = i;
- ke.kb_value = ibuff[j];
- ioctl(fd, KDSKBENT, &ke);
- }
+ fd = open("/dev/tty0", O_RDWR);
+ if (fd < 0) {
+ fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
+ return 1;
}
- }
- close (fd);
- return 0;
+
+ read(0, buff, 7);
+ if (0 != strncmp(buff, magic, 7)) {
+ fprintf(stderr, "This is not a valid binary keymap.\n");
+ return 1;
+ }
+
+ if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) {
+ fprintf(stderr, "Error reading keymap flags: %s\n",
+ strerror(errno));
+ return 1;
+ }
+
+ ibuff = (u_short *) malloc(ibuffsz);
+ if (!ibuff) {
+ fprintf(stderr, "Out of memory.\n");
+ return 1;
+ }
+
+ for (i = 0; i < MAX_NR_KEYMAPS; i++) {
+ if (flags[i] == 1) {
+ pos = 0;
+ while (pos < ibuffsz) {
+ if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos))
+ < 0) {
+ fprintf(stderr, "Error reading keymap: %s\n",
+ strerror(errno));
+ return 1;
+ }
+ pos += readsz;
+ }
+ for (j = 0; j < NR_KEYS; j++) {
+ ke.kb_index = j;
+ ke.kb_table = i;
+ ke.kb_value = ibuff[j];
+ ioctl(fd, KDSKBENT, &ke);
+ }
+ }
+ }
+ close(fd);
+ return 0;
}