aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
Diffstat (limited to 'applets')
-rw-r--r--applets/Makefile2
-rw-r--r--applets/Makefile.in2
-rw-r--r--applets/applets.c2
-rw-r--r--applets/busybox.c20
4 files changed, 13 insertions, 13 deletions
diff --git a/applets/Makefile b/applets/Makefile
index f4ebb1496..5f9167442 100644
--- a/applets/Makefile
+++ b/applets/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/applets/Makefile.in b/applets/Makefile.in
index cb6c647df..79582e069 100644
--- a/applets/Makefile.in
+++ b/applets/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/applets/applets.c b/applets/applets.c
index 9dc69f36f..7d8adfb65 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -423,7 +423,7 @@ static void parse_config_file(void)
423 } 423 }
424 424
425 /* Now get the the user/group info. */ 425 /* Now get the the user/group info. */
426 426
427 s = (char *) bb_skip_whitespace(e); 427 s = (char *) bb_skip_whitespace(e);
428 428
429 /* Note: We require whitespace between the mode and the 429 /* Note: We require whitespace between the mode and the
diff --git a/applets/busybox.c b/applets/busybox.c
index dfcf400e0..dbb5e176b 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -13,7 +13,7 @@ int been_there_done_that = 0; /* Also used in applets.c */
13const char *bb_applet_name; 13const char *bb_applet_name;
14 14
15#ifdef CONFIG_FEATURE_INSTALLER 15#ifdef CONFIG_FEATURE_INSTALLER
16/* 16/*
17 * directory table 17 * directory table
18 * this should be consistent w/ the enum, busybox.h::Location, 18 * this should be consistent w/ the enum, busybox.h::Location,
19 * or else... 19 * or else...
@@ -32,7 +32,7 @@ static const char* const install_dir[] = {
32/* abstract link() */ 32/* abstract link() */
33typedef int (*__link_f)(const char *, const char *); 33typedef int (*__link_f)(const char *, const char *);
34 34
35/* 35/*
36 * Where in the filesystem is this busybox? 36 * Where in the filesystem is this busybox?
37 * [return] 37 * [return]
38 * malloc'd string w/ full pathname of busybox's location 38 * malloc'd string w/ full pathname of busybox's location
@@ -52,7 +52,7 @@ static void install_links(const char *busybox, int use_symbolic_links)
52 int i; 52 int i;
53 int rc; 53 int rc;
54 54
55 if (use_symbolic_links) 55 if (use_symbolic_links)
56 Link = symlink; 56 Link = symlink;
57 57
58 for (i = 0; applets[i].name != NULL; i++) { 58 for (i = 0; applets[i].name != NULL; i++) {
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
82 bb_applet_name = s; 82 bb_applet_name = s;
83 } 83 }
84 84
85#ifdef CONFIG_LOCALE_SUPPORT 85#ifdef CONFIG_LOCALE_SUPPORT
86#ifdef CONFIG_INIT 86#ifdef CONFIG_INIT
87 if(getpid()!=1) /* Do not set locale for `init' */ 87 if(getpid()!=1) /* Do not set locale for `init' */
88#endif 88#endif
@@ -100,9 +100,9 @@ int busybox_main(int argc, char **argv)
100{ 100{
101 int col = 0, len, i; 101 int col = 0, len, i;
102 102
103#ifdef CONFIG_FEATURE_INSTALLER 103#ifdef CONFIG_FEATURE_INSTALLER
104 /* 104 /*
105 * This style of argument parsing doesn't scale well 105 * This style of argument parsing doesn't scale well
106 * in the event that busybox starts wanting more --options. 106 * in the event that busybox starts wanting more --options.
107 * If someone has a cleaner approach, by all means implement it. 107 * If someone has a cleaner approach, by all means implement it.
108 */ 108 */
@@ -113,8 +113,8 @@ int busybox_main(int argc, char **argv)
113 113
114 /* to use symlinks, or not to use symlinks... */ 114 /* to use symlinks, or not to use symlinks... */
115 if (argc > 2) { 115 if (argc > 2) {
116 if ((strcmp(argv[2], "-s") == 0)) { 116 if ((strcmp(argv[2], "-s") == 0)) {
117 use_symbolic_links = 1; 117 use_symbolic_links = 1;
118 } 118 }
119 } 119 }
120 120
@@ -150,7 +150,7 @@ int busybox_main(int argc, char **argv)
150 "\tBusyBox is a multi-call binary that combines many common Unix\n" 150 "\tBusyBox is a multi-call binary that combines many common Unix\n"
151 "\tutilities into a single executable. Most people will create a\n" 151 "\tutilities into a single executable. Most people will create a\n"
152 "\tlink to busybox for each function they wish to use, and BusyBox\n" 152 "\tlink to busybox for each function they wish to use, and BusyBox\n"
153 "\twill act like whatever it was invoked as.\n" 153 "\twill act like whatever it was invoked as.\n"
154 "\nCurrently defined functions:\n", bb_msg_full_version); 154 "\nCurrently defined functions:\n", bb_msg_full_version);
155 155
156 while (a->name != 0) { 156 while (a->name != 0) {