summaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorMatt Kraai2001-01-31 19:00:21 +0000
committerMatt Kraai2001-01-31 19:00:21 +0000
commitdd19c6990496023fe23fefef8f1798740f7d39c6 (patch)
tree3933adefa4171173db78fa2389146ac89f4edb86 /console-tools
parent63ec2732454a0c973305794e185e488106f6b282 (diff)
downloadbusybox-dd19c6990496023fe23fefef8f1798740f7d39c6.zip
busybox-dd19c6990496023fe23fefef8f1798740f7d39c6.tar.gz
Removed trailing \n from error_msg{,_and_die} messages.
Diffstat (limited to 'console-tools')
-rw-r--r--console-tools/deallocvt.c4
-rw-r--r--console-tools/dumpkmap.c2
-rw-r--r--console-tools/loadacm.c12
-rw-r--r--console-tools/loadfont.c14
-rw-r--r--console-tools/loadkmap.c2
-rw-r--r--console-tools/setkeycodes.c6
6 files changed, 20 insertions, 20 deletions
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index fad7a2b..b51fbae 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -31,9 +31,9 @@ int deallocvt_main(int argc, char *argv[])
for (i = 1; i < argc; i++) {
num = atoi(argv[i]);
if (num == 0)
- error_msg("0: illegal VT number\n");
+ error_msg("0: illegal VT number");
else if (num == 1)
- error_msg("VT 1 cannot be deallocated\n");
+ error_msg("VT 1 cannot be deallocated");
else if (ioctl(fd, VT_DISALLOCATE, num))
perror_msg_and_die("VT_DISALLOCATE");
}
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index b2067b3..4ab711e 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -81,7 +81,7 @@ int dumpkmap_main(int argc, char **argv)
ke.kb_table = i;
if (ioctl(fd, KDGKBENT, &ke) < 0) {
- error_msg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
+ error_msg("ioctl returned: %s, %s, %s, %xqq", strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
}
else {
write(1,(void*)&ke.kb_value,2);
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index 040062c..345a277 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -70,7 +70,7 @@ int screen_map_load(int fd, FILE * fp)
if (parse_failed) {
if (-1 == fseek(fp, 0, SEEK_SET)) {
if (errno == ESPIPE)
- error_msg_and_die("16bit screen-map MUST be a regular file.\n");
+ error_msg_and_die("16bit screen-map MUST be a regular file.");
else
perror_msg_and_die("fseek failed reading binary 16bit screen-map");
}
@@ -79,7 +79,7 @@ int screen_map_load(int fd, FILE * fp)
perror_msg_and_die("Cannot read [new] map from file");
#if 0
else
- error_msg("Input screen-map is binary.\n");
+ error_msg("Input screen-map is binary.");
#endif
}
@@ -96,7 +96,7 @@ int screen_map_load(int fd, FILE * fp)
/* rewind... */
if (-1 == fseek(fp, 0, SEEK_SET)) {
if (errno == ESPIPE)
- error_msg("Assuming 8bit screen-map - MUST be a regular file.\n"),
+ error_msg("Assuming 8bit screen-map - MUST be a regular file."),
exit(1);
else
perror_msg_and_die("fseek failed assuming 8bit screen-map");
@@ -109,7 +109,7 @@ int screen_map_load(int fd, FILE * fp)
if (-1 == fseek(fp, 0, SEEK_SET)) {
if (errno == ESPIPE)
/* should not - it succedeed above */
- error_msg_and_die("fseek() returned ESPIPE !\n");
+ error_msg_and_die("fseek() returned ESPIPE !");
else
perror_msg_and_die("fseek for binary 8bit screen-map");
}
@@ -118,7 +118,7 @@ int screen_map_load(int fd, FILE * fp)
perror_msg_and_die("Cannot read [old] map from file");
#if 0
else
- error_msg("Input screen-map is binary.\n");
+ error_msg("Input screen-map is binary.");
#endif
}
@@ -127,7 +127,7 @@ int screen_map_load(int fd, FILE * fp)
else
return 0;
}
- error_msg("Error parsing symbolic map\n");
+ error_msg("Error parsing symbolic map");
return(1);
}
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 08e0761..ec3e505 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -62,7 +62,7 @@ static void do_loadfont(int fd, char *inbuf, int unit, int fontsize)
memset(buf, 0, sizeof(buf));
if (unit < 1 || unit > 32)
- error_msg_and_die("Bad character size %d\n", unit);
+ error_msg_and_die("Bad character size %d", unit);
for (i = 0; i < fontsize; i++)
memcpy(buf + (32 * i), inbuf + (unit * i), unit);
@@ -119,8 +119,8 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
if (ioctl(fd, PIO_UNIMAPCLR, &advice)) {
#ifdef ENOIOCTLCMD
if (errno == ENOIOCTLCMD) {
- error_msg("It seems this kernel is older than 1.1.92\n");
- error_msg_and_die("No Unicode mapping table loaded.\n");
+ error_msg("It seems this kernel is older than 1.1.92");
+ error_msg_and_die("No Unicode mapping table loaded.");
} else
#endif
perror_msg_and_die("PIO_UNIMAPCLR");
@@ -174,11 +174,11 @@ static void loadnewfont(int fd)
goto no_psf;
if (psfhdr.mode > PSF_MAXMODE)
- error_msg_and_die("Unsupported psf file mode\n");
+ error_msg_and_die("Unsupported psf file mode");
fontsize = ((psfhdr.mode & PSF_MODE512) ? 512 : 256);
#if !defined( PIO_FONTX ) || defined( __sparc__ )
if (fontsize != 256)
- error_msg_and_die("Only fontsize 256 supported\n");
+ error_msg_and_die("Only fontsize 256 supported");
#endif
hastable = (psfhdr.mode & PSF_MODEHASTAB);
unit = psfhdr.charsize;
@@ -186,7 +186,7 @@ static void loadnewfont(int fd)
head = head0 + fontsize * unit;
if (head > inputlth || (!hastable && head != inputlth))
- error_msg_and_die("Input file: bad length\n");
+ error_msg_and_die("Input file: bad length");
do_loadfont(fd, inbuf + head0, unit, fontsize);
if (hastable)
do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
@@ -201,7 +201,7 @@ static void loadnewfont(int fd)
} else {
/* bare font */
if (inputlth & 0377)
- error_msg_and_die("Bad input file size\n");
+ error_msg_and_die("Bad input file size");
offset = 0;
unit = inputlth / 256;
}
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 75b40da..a98601a 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -59,7 +59,7 @@ int loadkmap_main(int argc, char **argv)
read(0, buff, 7);
if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
- error_msg_and_die("This is not a valid binary keymap.\n");
+ error_msg_and_die("This is not a valid binary keymap.");
if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS))
perror_msg_and_die("Error reading keymap flags");
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index be9b1b7..3e511ad 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -52,18 +52,18 @@ setkeycodes_main(int argc, char** argv)
a.keycode = atoi(argv[2]);
a.scancode = sc = strtol(argv[1], &ep, 16);
if (*ep) {
- error_msg_and_die("error reading SCANCODE: '%s'\n", argv[1]);
+ error_msg_and_die("error reading SCANCODE: '%s'", argv[1]);
}
if (a.scancode > 127) {
a.scancode -= 0xe000;
a.scancode += 128;
}
if (a.scancode > 255 || a.keycode > 127) {
- error_msg_and_die("SCANCODE or KEYCODE outside bounds\n");
+ error_msg_and_die("SCANCODE or KEYCODE outside bounds");
}
if (ioctl(fd,KDSETKEYCODE,&a)) {
perror("KDSETKEYCODE");
- error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d\n", sc, a.keycode);
+ error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode);
}
argc -= 2;
argv += 2;