svn commit: trunk/busybox: coreutils editors networking shell
vda at busybox.net
vda at busybox.net
Thu May 17 23:02:15 UTC 2007
Author: vda
Date: 2007-05-17 16:02:14 -0700 (Thu, 17 May 2007)
New Revision: 18644
Log:
several *.c files:
move 'extern environ' up to the location of #includes
Modified:
trunk/busybox/coreutils/env.c
trunk/busybox/coreutils/printenv.c
trunk/busybox/editors/awk.c
trunk/busybox/networking/inetd.c
trunk/busybox/shell/ash.c
Changeset:
Modified: trunk/busybox/coreutils/env.c
===================================================================
--- trunk/busybox/coreutils/env.c 2007-05-17 16:37:22 UTC (rev 18643)
+++ trunk/busybox/coreutils/env.c 2007-05-17 23:02:14 UTC (rev 18644)
@@ -32,6 +32,7 @@
#include "busybox.h"
#include <errno.h>
#include <getopt.h> /* struct option */
+extern char **environ;
#if ENABLE_FEATURE_ENV_LONG_OPTIONS
static const struct option env_long_options[] = {
@@ -49,7 +50,6 @@
char **ep;
unsigned opt;
llist_t *unset_env = NULL;
- extern char **environ;
opt_complementary = "u::";
#if ENABLE_FEATURE_ENV_LONG_OPTIONS
Modified: trunk/busybox/coreutils/printenv.c
===================================================================
--- trunk/busybox/coreutils/printenv.c 2007-05-17 16:37:22 UTC (rev 18643)
+++ trunk/busybox/coreutils/printenv.c 2007-05-17 23:02:14 UTC (rev 18644)
@@ -12,11 +12,11 @@
#include <string.h>
#include <stdlib.h>
#include "busybox.h"
+extern char **environ;
int printenv_main(int argc, char **argv);
int printenv_main(int argc, char **argv)
{
- extern char **environ;
int e = 0;
/* no variables specified, show whole env */
Modified: trunk/busybox/editors/awk.c
===================================================================
--- trunk/busybox/editors/awk.c 2007-05-17 16:37:22 UTC (rev 18643)
+++ trunk/busybox/editors/awk.c 2007-05-17 23:02:14 UTC (rev 18644)
@@ -10,6 +10,7 @@
#include "busybox.h"
#include "xregex.h"
#include <math.h>
+extern char **environ;
/* This is a NOEXEC applet. Be very careful! */
@@ -393,8 +394,6 @@
/* globals */
-extern char **environ;
-
static var * V[_intvarcount_];
static chain beginseq, mainseq, endseq, *seq;
static int nextrec, nextfile;
Modified: trunk/busybox/networking/inetd.c
===================================================================
--- trunk/busybox/networking/inetd.c 2007-05-17 16:37:22 UTC (rev 18643)
+++ trunk/busybox/networking/inetd.c 2007-05-17 23:02:14 UTC (rev 18644)
@@ -172,9 +172,11 @@
#include <rpc/pmap_clnt.h>
#endif
+extern char **environ;
+
+
#define _PATH_INETDPID "/var/run/inetd.pid"
-
#define CNT_INTVL 60 /* servers in CNT_INTVL sec. */
#define RETRYTIME (60*10) /* retry after bind or server fail */
@@ -1263,7 +1265,6 @@
sigset_t omask, wait_mask;
#ifdef INETD_SETPROCTITLE
- extern char **environ;
char **envp = environ;
Argv = argv;
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c 2007-05-17 16:37:22 UTC (rev 18643)
+++ trunk/busybox/shell/ash.c 2007-05-17 23:02:14 UTC (rev 18644)
@@ -60,6 +60,7 @@
#if JOBS || ENABLE_ASH_READ_NCHARS
#include <termios.h>
#endif
+extern char **environ;
#if defined(__uClinux__)
#error "Do not even bother, ash will not run on uClinux"
@@ -1747,7 +1748,6 @@
static struct redirtab *redirlist;
static int nullredirs;
-extern char **environ;
static int preverrout_fd; /* save fd2 before print debug if xflag is set. */
#define VTABSIZE 39
More information about the busybox-cvs
mailing list