aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManinder Singh <maninder1.s@samsung.com>2015-05-25 13:46:36 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-05-25 13:46:36 +0200
commit97c6491b4edf4bc9db293533ae0c3a81c4ef07f7 (patch)
tree7ac99422b82e761628c96855a57375f620f72997
parentc4603fb09aa2ec06bc8c0ad51b69fe7995a8ea17 (diff)
downloadbusybox-w32-97c6491b4edf4bc9db293533ae0c3a81c4ef07f7.tar.gz
busybox-w32-97c6491b4edf4bc9db293533ae0c3a81c4ef07f7.tar.bz2
busybox-w32-97c6491b4edf4bc9db293533ae0c3a81c4ef07f7.zip
typo fixes
Signed-off-by: Maninder Singh <maninder1.s@samsung.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Makefile2
-rw-r--r--coreutils/Config.src2
-rw-r--r--coreutils/stat.c2
-rw-r--r--coreutils/uudecode.c2
-rw-r--r--docs/cgi/env.html2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/dev.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/tag.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c4
-rw-r--r--editors/diff.c2
-rw-r--r--editors/vi.c14
-rw-r--r--findutils/xargs.c2
-rw-r--r--miscutils/less.c2
-rw-r--r--networking/netstat.c2
-rw-r--r--scripts/basic/docproc.c2
-rw-r--r--selinux/Config.src2
-rw-r--r--shell/hush.c2
-rw-r--r--util-linux/mkfs_reiser.c2
17 files changed, 24 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index e0888578f..65b2642f0 100644
--- a/Makefile
+++ b/Makefile
@@ -552,7 +552,7 @@ export INSTALL_PATH ?= /boot
552# 552#
553# INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory 553# INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory
554# relocations required by build roots. This is not defined in the 554# relocations required by build roots. This is not defined in the
555# makefile but the arguement can be passed to make if needed. 555# makefile but the argument can be passed to make if needed.
556# 556#
557 557
558MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) 558MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
diff --git a/coreutils/Config.src b/coreutils/Config.src
index 1bbb91ee9..1ec3a0a99 100644
--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@@ -11,7 +11,7 @@ config CAL
11 bool "cal" 11 bool "cal"
12 default y 12 default y
13 help 13 help
14 cal is used to display a monthly calender. 14 cal is used to display a monthly calendar.
15 15
16config CATV 16config CATV
17 bool "catv" 17 bool "catv"
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 769fac078..f7fd227bb 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -374,7 +374,7 @@ static void print_it(const char *masterformat,
374{ 374{
375 /* Create a working copy of the format string */ 375 /* Create a working copy of the format string */
376 char *format = xstrdup(masterformat); 376 char *format = xstrdup(masterformat);
377 /* Add 2 to accomodate our conversion of the stat '%s' format string 377 /* Add 2 to accommodate our conversion of the stat '%s' format string
378 * to the printf '%llu' one. */ 378 * to the printf '%llu' one. */
379 char *dest = xmalloc(strlen(format) + 2 + 1); 379 char *dest = xmalloc(strlen(format) + 2 + 1);
380 char *b; 380 char *b;
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 3f1227306..7aa5c67f2 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -46,7 +46,7 @@ static void FAST_FUNC read_stduu(FILE *src_stream, FILE *dst_stream, int flags U
46 46
47 encoded_len = line[0] * 4 / 3; 47 encoded_len = line[0] * 4 / 3;
48 /* Check that line is not too short. (we tolerate 48 /* Check that line is not too short. (we tolerate
49 * overly _long_ line to accomodate possible extra '`'). 49 * overly _long_ line to accommodate possible extra '`').
50 * Empty line case is also caught here. */ 50 * Empty line case is also caught here. */
51 if (str_len <= encoded_len) { 51 if (str_len <= encoded_len) {
52 break; /* go to bb_error_msg_and_die("short file"); */ 52 break; /* go to bb_error_msg_and_die("short file"); */
diff --git a/docs/cgi/env.html b/docs/cgi/env.html
index b83c750bf..66a548b46 100644
--- a/docs/cgi/env.html
+++ b/docs/cgi/env.html
@@ -38,7 +38,7 @@ fulfilled by the gateway program: <p>
38 38
39</p><ul> 39</p><ul>
40<li> <a name="protocol"><code>SERVER_PROTOCOL</code></a> <p> 40<li> <a name="protocol"><code>SERVER_PROTOCOL</code></a> <p>
41 The name and revision of the information protcol this request came 41 The name and revision of the information protocol this request came
42 in with. Format: protocol/revision </p><p> 42 in with. Format: protocol/revision </p><p>
43 43
44</p></li><li> <code>SERVER_PORT</code> <p> 44</p></li><li> <code>SERVER_PORT</code> <p>
diff --git a/e2fsprogs/old_e2fsprogs/blkid/dev.c b/e2fsprogs/old_e2fsprogs/blkid/dev.c
index 260e49c65..84b7b0a72 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/dev.c
@@ -90,7 +90,7 @@ void blkid_debug_dump_dev(blkid_dev dev)
90 * 90 *
91 * These routines do not expose the list.h implementation, which are a 91 * These routines do not expose the list.h implementation, which are a
92 * contamination of the namespace, and which force us to reveal far, far 92 * contamination of the namespace, and which force us to reveal far, far
93 * too much of our internal implemenation. I'm not convinced I want 93 * too much of our internal implementation. I'm not convinced I want
94 * to keep list.h in the long term, anyway. It's fine for kernel 94 * to keep list.h in the long term, anyway. It's fine for kernel
95 * programming, but performance is not the #1 priority for this 95 * programming, but performance is not the #1 priority for this
96 * library, and I really don't like the tradeoff of type-safety for 96 * library, and I really don't like the tradeoff of type-safety for
diff --git a/e2fsprogs/old_e2fsprogs/blkid/tag.c b/e2fsprogs/old_e2fsprogs/blkid/tag.c
index 7424edeb8..f10a701d2 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/tag.c
@@ -230,7 +230,7 @@ errout:
230 * 230 *
231 * These routines do not expose the list.h implementation, which are a 231 * These routines do not expose the list.h implementation, which are a
232 * contamination of the namespace, and which force us to reveal far, far 232 * contamination of the namespace, and which force us to reveal far, far
233 * too much of our internal implemenation. I'm not convinced I want 233 * too much of our internal implementation. I'm not convinced I want
234 * to keep list.h in the long term, anyway. It's fine for kernel 234 * to keep list.h in the long term, anyway. It's fine for kernel
235 * programming, but performance is not the #1 priority for this 235 * programming, but performance is not the #1 priority for this
236 * library, and I really don't like the tradeoff of type-safety for 236 * library, and I really don't like the tradeoff of type-safety for
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 0799b64ad..b816c62b0 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -6381,7 +6381,7 @@ static int deallocate_inode_block(ext2_filsys fs, blk_t *block_nr,
6381} 6381}
6382 6382
6383/* 6383/*
6384 * This fuction deallocates an inode 6384 * This function deallocates an inode
6385 */ 6385 */
6386static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf) 6386static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf)
6387{ 6387{
@@ -6447,7 +6447,7 @@ static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* block_buf)
6447} 6447}
6448 6448
6449/* 6449/*
6450 * This fuction clears the htree flag on an inode 6450 * This function clears the htree flag on an inode
6451 */ 6451 */
6452static void clear_htree(e2fsck_t ctx, ext2_ino_t ino) 6452static void clear_htree(e2fsck_t ctx, ext2_ino_t ino)
6453{ 6453{
diff --git a/editors/diff.c b/editors/diff.c
index c3ad31bf3..cf14b1d03 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -363,7 +363,7 @@ static void stone(const int *a, int n, const int *b, int *J, int pref)
363} 363}
364 364
365struct line { 365struct line {
366 /* 'serial' is not used in the begining, so we reuse it 366 /* 'serial' is not used in the beginning, so we reuse it
367 * to store line offsets, thus reducing memory pressure 367 * to store line offsets, thus reducing memory pressure
368 */ 368 */
369 union { 369 union {
diff --git a/editors/vi.c b/editors/vi.c
index 2e4f7fcb5..6ce513c0c 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -501,7 +501,7 @@ static char *prev_line(char *); // return pointer to prev line B-o-l
501static char *next_line(char *); // return pointer to next line B-o-l 501static char *next_line(char *); // return pointer to next line B-o-l
502static char *end_screen(void); // get pointer to last char on screen 502static char *end_screen(void); // get pointer to last char on screen
503static int count_lines(char *, char *); // count line from start to stop 503static int count_lines(char *, char *); // count line from start to stop
504static char *find_line(int); // find begining of line #li 504static char *find_line(int); // find beginning of line #li
505static char *move_to_col(char *, int); // move "p" to column l 505static char *move_to_col(char *, int); // move "p" to column l
506static void dot_left(void); // move dot left- dont leave line 506static void dot_left(void); // move dot left- dont leave line
507static void dot_right(void); // move dot right- dont leave line 507static void dot_right(void); // move dot right- dont leave line
@@ -1684,10 +1684,10 @@ static char *dollar_line(char *p) // return pointer to just before NL line
1684 1684
1685static char *prev_line(char *p) // return pointer first char prev line 1685static char *prev_line(char *p) // return pointer first char prev line
1686{ 1686{
1687 p = begin_line(p); // goto begining of cur line 1687 p = begin_line(p); // goto beginning of cur line
1688 if (p > text && p[-1] == '\n') 1688 if (p > text && p[-1] == '\n')
1689 p--; // step to prev line 1689 p--; // step to prev line
1690 p = begin_line(p); // goto begining of prev line 1690 p = begin_line(p); // goto beginning of prev line
1691 return p; 1691 return p;
1692} 1692}
1693 1693
@@ -1735,7 +1735,7 @@ static int count_lines(char *start, char *stop)
1735 return cnt; 1735 return cnt;
1736} 1736}
1737 1737
1738static char *find_line(int li) // find begining of line #li 1738static char *find_line(int li) // find beginning of line #li
1739{ 1739{
1740 char *q; 1740 char *q;
1741 1741
@@ -3357,7 +3357,7 @@ static void refresh(int full_screen)
3357 tp = t + 1; 3357 tp = t + 1;
3358 } 3358 }
3359 3359
3360 // see if there are any changes between vitual screen and out_buf 3360 // see if there are any changes between virtual screen and out_buf
3361 changed = FALSE; // assume no change 3361 changed = FALSE; // assume no change
3362 cs = 0; 3362 cs = 0;
3363 ce = columns - 1; 3363 ce = columns - 1;
@@ -3394,7 +3394,7 @@ static void refresh(int full_screen)
3394 if (cs < 0) cs = 0; 3394 if (cs < 0) cs = 0;
3395 if (ce > columns - 1) ce = columns - 1; 3395 if (ce > columns - 1) ce = columns - 1;
3396 if (cs > ce) { cs = 0; ce = columns - 1; } 3396 if (cs > ce) { cs = 0; ce = columns - 1; }
3397 // is there a change between vitual screen and out_buf 3397 // is there a change between virtual screen and out_buf
3398 if (changed) { 3398 if (changed) {
3399 // copy changed part of buffer to virtual screen 3399 // copy changed part of buffer to virtual screen
3400 memcpy(sp+cs, out_buf+cs, ce-cs+1); 3400 memcpy(sp+cs, out_buf+cs, ce-cs+1);
@@ -3844,7 +3844,7 @@ static void do_cmd(int c)
3844 } 3844 }
3845 break; 3845 break;
3846#endif /* FEATURE_VI_SEARCH */ 3846#endif /* FEATURE_VI_SEARCH */
3847 case '0': // 0- goto begining of line 3847 case '0': // 0- goto beginning of line
3848 case '1': // 1- 3848 case '1': // 1-
3849 case '2': // 2- 3849 case '2': // 2-
3850 case '3': // 3- 3850 case '3': // 3-
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 76c4747fe..25e47ec89 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -151,7 +151,7 @@ static void store_param(char *s)
151 * is seen, store the address of a new parameter to args[]. 151 * is seen, store the address of a new parameter to args[].
152 * If reading discovers that last chars do not form the complete 152 * If reading discovers that last chars do not form the complete
153 * parameter, the pointer to the first such "tail character" is returned. 153 * parameter, the pointer to the first such "tail character" is returned.
154 * (buf has extra byte at the end to accomodate terminating NUL 154 * (buf has extra byte at the end to accommodate terminating NUL
155 * of "tail characters" string). 155 * of "tail characters" string).
156 * Otherwise, the returned pointer points to NUL byte. 156 * Otherwise, the returned pointer points to NUL byte.
157 * On entry, buf[] may contain some "seed chars" which are to become 157 * On entry, buf[] may contain some "seed chars" which are to become
diff --git a/miscutils/less.c b/miscutils/less.c
index 554e54687..d5a68d1e1 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -1848,7 +1848,7 @@ key and/or command line switch compatibility is a good idea:
1848 Most options may be changed either on the command line, 1848 Most options may be changed either on the command line,
1849 or from within less by using the - or -- command. 1849 or from within less by using the - or -- command.
1850 Options may be given in one of two forms: either a single 1850 Options may be given in one of two forms: either a single
1851 character preceded by a -, or a name preceeded by --. 1851 character preceded by a -, or a name preceded by --.
1852 -? ........ --help 1852 -? ........ --help
1853 Display help (from command line). 1853 Display help (from command line).
1854 -a ........ --search-skip-screen 1854 -a ........ --search-skip-screen
diff --git a/networking/netstat.c b/networking/netstat.c
index 1303d3f3d..2196d42f7 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -119,7 +119,7 @@ typedef enum {
119#define ADDR_NORMAL_WIDTH 23 119#define ADDR_NORMAL_WIDTH 23
120/* When there are IPv6 connections the IPv6 addresses will be 120/* When there are IPv6 connections the IPv6 addresses will be
121 * truncated to none-recognition. The '-W' option makes the 121 * truncated to none-recognition. The '-W' option makes the
122 * address columns wide enough to accomodate for longest possible 122 * address columns wide enough to accommodate for longest possible
123 * IPv6 addresses, i.e. addresses of the form 123 * IPv6 addresses, i.e. addresses of the form
124 * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:ddd.ddd.ddd.ddd 124 * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:ddd.ddd.ddd.ddd
125 */ 125 */
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 7f21443c1..720098a23 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -264,7 +264,7 @@ void singfunc(char * filename, char * line)
264 vec[idx++] = KERNELDOC; 264 vec[idx++] = KERNELDOC;
265 vec[idx++] = DOCBOOK; 265 vec[idx++] = DOCBOOK;
266 266
267 /* Split line up in individual parameters preceeded by FUNCTION */ 267 /* Split line up in individual parameters preceded by FUNCTION */
268 for (i=0; line[i]; i++) { 268 for (i=0; line[i]; i++) {
269 if (isspace(line[i])) { 269 if (isspace(line[i])) {
270 line[i] = '\0'; 270 line[i] = '\0';
diff --git a/selinux/Config.src b/selinux/Config.src
index 47d15b6af..d4701f60b 100644
--- a/selinux/Config.src
+++ b/selinux/Config.src
@@ -64,7 +64,7 @@ config RUNCON
64 default n 64 default n
65 depends on SELINUX 65 depends on SELINUX
66 help 66 help
67 Enable support to run command in speficied security context. 67 Enable support to run command in specified security context.
68 68
69config FEATURE_RUNCON_LONG_OPTIONS 69config FEATURE_RUNCON_LONG_OPTIONS
70 bool "Enable long options" 70 bool "Enable long options"
diff --git a/shell/hush.c b/shell/hush.c
index f2c0a70f2..96c739fb7 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -442,7 +442,7 @@ enum {
442 MAYBE_ASSIGNMENT = 0, 442 MAYBE_ASSIGNMENT = 0,
443 DEFINITELY_ASSIGNMENT = 1, 443 DEFINITELY_ASSIGNMENT = 1,
444 NOT_ASSIGNMENT = 2, 444 NOT_ASSIGNMENT = 2,
445 /* Not an assigment, but next word may be: "if v=xyz cmd;" */ 445 /* Not an assignment, but next word may be: "if v=xyz cmd;" */
446 WORD_IS_KEYWORD = 3, 446 WORD_IS_KEYWORD = 3,
447}; 447};
448/* Used for initialization: o_string foo = NULL_O_STRING; */ 448/* Used for initialization: o_string foo = NULL_O_STRING; */
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index 13abaa889..56c8f0ab5 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -66,7 +66,7 @@ struct reiserfs_super_block {
66 66
67 char s_magic[10]; /* 52 "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */ 67 char s_magic[10]; /* 52 "ReIsErFs" or "ReIsEr2Fs" or "ReIsEr3Fs" */
68 uint16_t sb_fs_state; /* 62 it is set to used by fsck to mark which phase of rebuilding is done (used for fsck debugging) */ 68 uint16_t sb_fs_state; /* 62 it is set to used by fsck to mark which phase of rebuilding is done (used for fsck debugging) */
69 uint32_t sb_hash_function_code; /* 64 code of fuction which was/is/will be used to sort names in a directory. See codes in above */ 69 uint32_t sb_hash_function_code; /* 64 code of function which was/is/will be used to sort names in a directory. See codes in above */
70 uint16_t sb_tree_height; /* 68 height of filesytem tree. Tree consisting of only one root block has 2 here */ 70 uint16_t sb_tree_height; /* 68 height of filesytem tree. Tree consisting of only one root block has 2 here */
71 uint16_t sb_bmap_nr; /* 70 amount of bitmap blocks needed to address each block of file system */ 71 uint16_t sb_bmap_nr; /* 70 amount of bitmap blocks needed to address each block of file system */
72 uint16_t sb_version; /* 72 this field is only reliable on filesystem with non-standard journal */ 72 uint16_t sb_version; /* 72 this field is only reliable on filesystem with non-standard journal */