aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/Config.in12
-rw-r--r--miscutils/Makefile2
-rw-r--r--miscutils/Makefile.in2
-rw-r--r--miscutils/adjtimex.c4
-rw-r--r--miscutils/dc.c6
-rw-r--r--miscutils/hdparm.c6
-rw-r--r--miscutils/last.c6
-rw-r--r--miscutils/makedevs.c4
-rw-r--r--miscutils/mt.c2
-rw-r--r--miscutils/rx.c14
-rw-r--r--miscutils/strings.c2
-rw-r--r--miscutils/time.c2
-rw-r--r--miscutils/watchdog.c2
13 files changed, 32 insertions, 32 deletions
diff --git a/miscutils/Config.in b/miscutils/Config.in
index c5327c201..7e18c16a0 100644
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
@@ -86,11 +86,11 @@ config CONFIG_HDPARM
86 default n 86 default n
87 help 87 help
88 Get/Set hard drive parameters. Primarily intended for ATA 88 Get/Set hard drive parameters. Primarily intended for ATA
89 drives. Adds about 13k (or around 30k if you enable the 89 drives. Adds about 13k (or around 30k if you enable the
90 CONFIG_FEATURE_HDPARM_GET_IDENTITY option).... 90 CONFIG_FEATURE_HDPARM_GET_IDENTITY option)....
91 91
92config CONFIG_FEATURE_HDPARM_GET_IDENTITY 92config CONFIG_FEATURE_HDPARM_GET_IDENTITY
93 bool " Support obtaining detailed information directly from drives" 93 bool " Support obtaining detailed information directly from drives"
94 default y 94 default y
95 depends on CONFIG_HDPARM 95 depends on CONFIG_HDPARM
96 help 96 help
@@ -99,7 +99,7 @@ config CONFIG_FEATURE_HDPARM_GET_IDENTITY
99 feature set. Enabling this option will add about 16k... 99 feature set. Enabling this option will add about 16k...
100 100
101config CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF 101config CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
102 bool " Register an IDE interface (DANGEROUS)" 102 bool " Register an IDE interface (DANGEROUS)"
103 default n 103 default n
104 depends on CONFIG_HDPARM 104 depends on CONFIG_HDPARM
105 help 105 help
@@ -107,7 +107,7 @@ config CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
107 This is dangerous stuff, so you should probably say N. 107 This is dangerous stuff, so you should probably say N.
108 108
109config CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF 109config CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
110 bool " Un-register an IDE interface (DANGEROUS)" 110 bool " Un-register an IDE interface (DANGEROUS)"
111 default n 111 default n
112 depends on CONFIG_HDPARM 112 depends on CONFIG_HDPARM
113 help 113 help
@@ -115,7 +115,7 @@ config CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
115 This is dangerous stuff, so you should probably say N. 115 This is dangerous stuff, so you should probably say N.
116 116
117config CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET 117config CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
118 bool " perform device reset (DANGEROUS)" 118 bool " perform device reset (DANGEROUS)"
119 default n 119 default n
120 depends on CONFIG_HDPARM 120 depends on CONFIG_HDPARM
121 help 121 help
@@ -123,7 +123,7 @@ config CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
123 This is dangerous stuff, so you should probably say N. 123 This is dangerous stuff, so you should probably say N.
124 124
125config CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF 125config CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
126 bool " tristate device for hotswap (DANGEROUS)" 126 bool " tristate device for hotswap (DANGEROUS)"
127 default n 127 default n
128 depends on CONFIG_HDPARM 128 depends on CONFIG_HDPARM
129 help 129 help
diff --git a/miscutils/Makefile b/miscutils/Makefile
index 374ce68f8..4bae72476 100644
--- a/miscutils/Makefile
+++ b/miscutils/Makefile
@@ -1,6 +1,6 @@
1# Makefile for busybox 1# Makefile for busybox
2# 2#
3# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
4# 4#
5# This program is free software; you can redistribute it and/or modify 5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
diff --git a/miscutils/Makefile.in b/miscutils/Makefile.in
index fea9b8926..89e3208a6 100644
--- a/miscutils/Makefile.in
+++ b/miscutils/Makefile.in
@@ -1,6 +1,6 @@
1# Makefile for busybox 1# Makefile for busybox
2# 2#
3# Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> 3# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
4# 4#
5# This program is free software; you can redistribute it and/or modify 5# This program is free software; you can redistribute it and/or modify
6# it under the terms of the GNU General Public License as published by 6# it under the terms of the GNU General Public License as published by
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index e941f6b4f..110c02654 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -76,7 +76,7 @@ static char *ret_code_descript[] = {
76#else 76#else
77void usage(char *prog) 77void usage(char *prog)
78{ 78{
79 fprintf(stderr, 79 fprintf(stderr,
80 "Usage: %s [ -q ] [ -o offset ] [ -f frequency ] [ -p timeconstant ] [ -t tick ]\n", 80 "Usage: %s [ -q ] [ -o offset ] [ -f frequency ] [ -p timeconstant ] [ -t tick ]\n",
81 prog); 81 prog);
82} 82}
@@ -126,7 +126,7 @@ int main(int argc, char ** argv)
126 ret = adjtimex(&txc); 126 ret = adjtimex(&txc);
127 127
128 if (ret < 0) perror("adjtimex"); 128 if (ret < 0) perror("adjtimex");
129 129
130 if (!quiet && ret>=0) { 130 if (!quiet && ret>=0) {
131 printf( 131 printf(
132 " mode: %d\n" 132 " mode: %d\n"
diff --git a/miscutils/dc.c b/miscutils/dc.c
index f574ae4a0..0ac658d9c 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -87,7 +87,7 @@ static void not(void)
87 87
88static void set_output_base(void) 88static void set_output_base(void)
89{ 89{
90 base=(unsigned char)pop(); 90 base=(unsigned char)pop();
91 if ((base != 10) && (base != 16)) { 91 if ((base != 10) && (base != 16)) {
92 fprintf(stderr, "Error: base = %d is not supported.\n", base); 92 fprintf(stderr, "Error: base = %d is not supported.\n", base);
93 base=10; 93 base=10;
@@ -96,7 +96,7 @@ static void set_output_base(void)
96 96
97static void print_base(double print) 97static void print_base(double print)
98{ 98{
99 if (base == 16) 99 if (base == 16)
100 printf("%x\n", (unsigned int)print); 100 printf("%x\n", (unsigned int)print);
101 else 101 else
102 printf("%g\n", print); 102 printf("%g\n", print);
@@ -178,7 +178,7 @@ static void stack_machine(const char *argument)
178} 178}
179 179
180/* return pointer to next token in buffer and set *buffer to one char 180/* return pointer to next token in buffer and set *buffer to one char
181 * past the end of the above mentioned token 181 * past the end of the above mentioned token
182 */ 182 */
183static char *get_token(char **buffer) 183static char *get_token(char **buffer)
184{ 184{
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 5c91b522d..eaa61c102 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -606,7 +606,7 @@ static uint8_t mode_loop(uint16_t mode_sup, uint16_t mode_sel, int cc, uint8_t *
606static void print_ascii(uint16_t *p, uint8_t length) { 606static void print_ascii(uint16_t *p, uint8_t length) {
607 uint8_t ii; 607 uint8_t ii;
608 char cl; 608 char cl;
609 609
610 /* find first non-space & print it */ 610 /* find first non-space & print it */
611 for(ii = 0; ii< length; ii++) 611 for(ii = 0; ii< length; ii++)
612 { 612 {
@@ -1080,7 +1080,7 @@ static void identify (uint16_t *id_supplied, const char *devname)
1080 if_printf(((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)), 1080 if_printf(((dev == ATAPI_DEV) && (eqpt != CDROM) && (val[CAPAB_0] & DMA_IL_SUP)),
1081 "\t Interleaved DMA support\n"); 1081 "\t Interleaved DMA support\n");
1082 1082
1083 if((val[WHATS_VALID] & OK_W64_70) && 1083 if((val[WHATS_VALID] & OK_W64_70) &&
1084 (val[DMA_TIME_MIN] || val[DMA_TIME_NORM])) 1084 (val[DMA_TIME_MIN] || val[DMA_TIME_NORM]))
1085 { 1085 {
1086 printf("\t Cycle time:"); 1086 printf("\t Cycle time:");
@@ -1241,7 +1241,7 @@ static int do_ctimings, do_timings = 0;
1241static unsigned long set_readahead= 0, get_readahead= 0, bbreadahead= 0; 1241static unsigned long set_readahead= 0, get_readahead= 0, bbreadahead= 0;
1242static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; 1242static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
1243static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; 1243static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0;
1244static unsigned long set_mult = 0, get_mult = 0, mult = 0; 1244static unsigned long set_mult = 0, get_mult = 0, mult = 0;
1245#ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA 1245#ifdef CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
1246static unsigned long set_dma = 0, get_dma = 0, dma = 0; 1246static unsigned long set_dma = 0, get_dma = 0, dma = 0;
1247#endif 1247#endif
diff --git a/miscutils/last.c b/miscutils/last.c
index e7f9eb57a..86613bf27 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -2,7 +2,7 @@
2/* 2/*
3 * last implementation for busybox 3 * last implementation for busybox
4 * 4 *
5 * Copyright (C) 2003 Erik Andersen <andersen@codepoet.org> 5 * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -68,10 +68,10 @@ extern int last_main(int argc, char **argv)
68 else if (strncmp(ut.ut_user, "runlevel", 7) == 0) 68 else if (strncmp(ut.ut_user, "runlevel", 7) == 0)
69 ut.ut_type = RUN_LVL; 69 ut.ut_type = RUN_LVL;
70 } else { 70 } else {
71 if (!ut.ut_name[0] || strcmp(ut.ut_name, "LOGIN") == 0 || 71 if (!ut.ut_name[0] || strcmp(ut.ut_name, "LOGIN") == 0 ||
72 ut.ut_name[0] == 0) 72 ut.ut_name[0] == 0)
73 { 73 {
74 /* Don't bother. This means we can't find how long 74 /* Don't bother. This means we can't find how long
75 * someone was logged in for. Oh well. */ 75 * someone was logged in for. Oh well. */
76 continue; 76 continue;
77 } 77 }
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 308d651ae..45498bb1d 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -1,9 +1,9 @@
1/* vi: set sw=4 ts=4: */ 1/* vi: set sw=4 ts=4: */
2/* 2/*
3 * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com> 3 * public domain -- Dave 'Kill a Cop' Cinege <dcinege@psychosis.com>
4 * 4 *
5 * makedevs 5 * makedevs
6 * Make ranges of device files quickly. 6 * Make ranges of device files quickly.
7 * known bugs: can't deal with alpha ranges 7 * known bugs: can't deal with alpha ranges
8 */ 8 */
9 9
diff --git a/miscutils/mt.c b/miscutils/mt.c
index e79954552..b0cdaccb9 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -57,7 +57,7 @@ extern int mt_main(int argc, char **argv)
57 struct mtop op; 57 struct mtop op;
58 struct mtpos position; 58 struct mtpos position;
59 int fd, mode; 59 int fd, mode;
60 60
61 if (argc < 2) { 61 if (argc < 2) {
62 bb_show_usage(); 62 bb_show_usage();
63 } 63 }
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 2b16f2e22..8edc8877a 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -1,14 +1,14 @@
1/*------------------------------------------------------------------------- 1/*-------------------------------------------------------------------------
2 * Filename: xmodem.c 2 * Filename: xmodem.c
3 * Version: $Id: rx.c,v 1.1 2003/12/20 07:30:35 bug1 Exp $ 3 * Version: $Id: rx.c,v 1.2 2004/03/15 08:28:46 andersen Exp $
4 * Copyright: Copyright (C) 2001, Hewlett-Packard Company 4 * Copyright: Copyright (C) 2001, Hewlett-Packard Company
5 * Author: Christopher Hoover <ch@hpl.hp.com> 5 * Author: Christopher Hoover <ch@hpl.hp.com>
6 * Description: xmodem functionality for uploading of kernels 6 * Description: xmodem functionality for uploading of kernels
7 * and the like 7 * and the like
8 * Created at: Thu Dec 20 01:58:08 PST 2001 8 * Created at: Thu Dec 20 01:58:08 PST 2001
9 *-----------------------------------------------------------------------*/ 9 *-----------------------------------------------------------------------*/
10/* 10/*
11 * xmodem.c: xmodem functionality for uploading of kernels and 11 * xmodem.c: xmodem functionality for uploading of kernels and
12 * the like 12 * the like
13 * 13 *
14 * Copyright (C) 2001 Hewlett-Packard Laboratories 14 * Copyright (C) 2001 Hewlett-Packard Laboratories
@@ -69,7 +69,7 @@ Cf:
69#define TIMEOUT_LONG 10 69#define TIMEOUT_LONG 10
70#define MAXERRORS 10 70#define MAXERRORS 10
71 71
72static inline void write_byte(int fd, char cc) { 72static inline void write_byte(int fd, char cc) {
73 write(fd, &cc, 1); 73 write(fd, &cc, 1);
74} 74}
75 75
@@ -80,7 +80,7 @@ static inline void write_flush(int fd) {
80static inline void read_flush(int fd) { 80static inline void read_flush(int fd) {
81 tcflush(fd, TCIFLUSH); 81 tcflush(fd, TCIFLUSH);
82} 82}
83 83
84static int read_byte(int fd, unsigned int timeout) { 84static int read_byte(int fd, unsigned int timeout) {
85 char buf[1]; 85 char buf[1];
86 int n; 86 int n;
@@ -312,12 +312,12 @@ int rx_main(int argc, char **argv)
312 312
313 if (tcgetattr(ttyfd, &tty) < 0) 313 if (tcgetattr(ttyfd, &tty) < 0)
314 bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]); 314 bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]);
315 315
316 orig_tty = tty; 316 orig_tty = tty;
317 317
318 cfmakeraw(&tty); 318 cfmakeraw(&tty);
319 tcsetattr(ttyfd, TCSAFLUSH, &tty); 319 tcsetattr(ttyfd, TCSAFLUSH, &tty);
320 320
321 memset(&act, 0, sizeof(act)); 321 memset(&act, 0, sizeof(act));
322 act.sa_handler = sigalrm_handler; 322 act.sa_handler = sigalrm_handler;
323 sigaction(SIGALRM, &act, 0); 323 sigaction(SIGALRM, &act, 0);
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 4778cfb5f..5dcd876e9 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -136,7 +136,7 @@ pipe:
136 * documentation and/or other materials provided with the distribution. 136 * documentation and/or other materials provided with the distribution.
137 * 137 *
138 * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 138 * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
139 * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 139 * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
140 * 140 *
141 * 4. Neither the name of the University nor the names of its contributors 141 * 4. Neither the name of the University nor the names of its contributors
142 * may be used to endorse or promote products derived from this software 142 * may be used to endorse or promote products derived from this software
diff --git a/miscutils/time.c b/miscutils/time.c
index 7aaa12e2a..ca896a1c5 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -17,7 +17,7 @@
17 02111-1307, USA. */ 17 02111-1307, USA. */
18 18
19/* Originally written by David Keppel <pardo@cs.washington.edu>. 19/* Originally written by David Keppel <pardo@cs.washington.edu>.
20 Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>. 20 Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>.
21 Heavily modified for busybox by Erik Andersen <andersen@codepoet.org> 21 Heavily modified for busybox by Erik Andersen <andersen@codepoet.org>
22 */ 22 */
23 23
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index b1167dc90..276fadebd 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -67,7 +67,7 @@ extern int watchdog_main(int argc, char **argv)
67 fd = bb_xopen(argv[argc - 1], O_WRONLY); 67 fd = bb_xopen(argv[argc - 1], O_WRONLY);
68 68
69 while (1) { 69 while (1) {
70 /* 70 /*
71 * Make sure we clear the counter before sleeping, as the counter value 71 * Make sure we clear the counter before sleeping, as the counter value
72 * is undefined at this point -- PFM 72 * is undefined at this point -- PFM
73 */ 73 */