aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2001-01-27 08:32:57 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2001-01-27 08:32:57 +0000
commit90ca2848fdca2788a52daac51432e1077abc24f7 (patch)
treea00ab095af09dc4c078bb782d371915681780dad
parented3ef50c233ffb1b50ea0e7382a8e60b86491009 (diff)
downloadbusybox-90ca2848fdca2788a52daac51432e1077abc24f7.tar.gz
busybox-90ca2848fdca2788a52daac51432e1077abc24f7.tar.bz2
Fix some formatting
-rw-r--r--applets/busybox.c11
-rw-r--r--busybox.c11
2 files changed, 10 insertions, 12 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index ab3762eb8..e56d2a4ed 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -2,6 +2,7 @@
#include "busybox.h"
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
@@ -15,8 +16,6 @@
#include "messages.c"
static int been_there_done_that = 0;
-
-
const char *applet_name;
#ifdef BB_FEATURE_INSTALLER
@@ -70,12 +69,12 @@ static void install_links(const char *busybox, int use_symbolic_links)
int i;
int rc;
- if (use_symbolic_links) Link = symlink;
+ if (use_symbolic_links)
+ Link = symlink;
for (i = 0; applets[i].name != NULL; i++) {
sprintf ( command, "%s/%s",
- install_dir[applets[i].location],
- applets[i].name);
+ install_dir[applets[i].location], applets[i].name);
rc = Link(busybox, command);
if (rc) {
@@ -190,7 +189,7 @@ int busybox_main(int argc, char **argv)
/* Fix up the argv pointers */
len = argv[1] - argv[0];
- memmove(argv, argv+1, sizeof(char *) * (argc + 1));
+ memmove(argv, argv + 1, sizeof(char *) * (argc + 1));
for (i = 0; i < argc; i++)
argv[i] -= len;
diff --git a/busybox.c b/busybox.c
index ab3762eb8..e56d2a4ed 100644
--- a/busybox.c
+++ b/busybox.c
@@ -2,6 +2,7 @@
#include "busybox.h"
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
@@ -15,8 +16,6 @@
#include "messages.c"
static int been_there_done_that = 0;
-
-
const char *applet_name;
#ifdef BB_FEATURE_INSTALLER
@@ -70,12 +69,12 @@ static void install_links(const char *busybox, int use_symbolic_links)
int i;
int rc;
- if (use_symbolic_links) Link = symlink;
+ if (use_symbolic_links)
+ Link = symlink;
for (i = 0; applets[i].name != NULL; i++) {
sprintf ( command, "%s/%s",
- install_dir[applets[i].location],
- applets[i].name);
+ install_dir[applets[i].location], applets[i].name);
rc = Link(busybox, command);
if (rc) {
@@ -190,7 +189,7 @@ int busybox_main(int argc, char **argv)
/* Fix up the argv pointers */
len = argv[1] - argv[0];
- memmove(argv, argv+1, sizeof(char *) * (argc + 1));
+ memmove(argv, argv + 1, sizeof(char *) * (argc + 1));
for (i = 0; i < argc; i++)
argv[i] -= len;