svn commit: trunk/busybox: applets archival/libunarchive console-to etc...
aldot at busybox.net
aldot at busybox.net
Wed Apr 4 20:52:05 UTC 2007
Author: aldot
Date: 2007-04-04 13:52:03 -0700 (Wed, 04 Apr 2007)
New Revision: 18327
Log:
- sed -e "s/char[[:space:]]*\*[[:space:]]*argv\[\]/char **argv/g"
Modified:
trunk/busybox/applets/individual.c
trunk/busybox/archival/libunarchive/decompress_bunzip2.c
trunk/busybox/console-tools/deallocvt.c
trunk/busybox/coreutils/dos2unix.c
trunk/busybox/e2fsprogs/fsck.c
trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c
trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c
trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
trunk/busybox/findutils/grep.c
trunk/busybox/init/halt.c
trunk/busybox/init/mesg.c
trunk/busybox/miscutils/nmeter.c
trunk/busybox/miscutils/runlevel.c
trunk/busybox/miscutils/setsid.c
trunk/busybox/networking/ether-wake.c
trunk/busybox/networking/httpd.c
trunk/busybox/networking/inetd.c
trunk/busybox/networking/traceroute.c
trunk/busybox/networking/udhcp/dhcpc.c
trunk/busybox/networking/udhcp/dhcpd.c
trunk/busybox/networking/udhcp/dumpleases.c
trunk/busybox/networking/zcip.c
trunk/busybox/scripts/basic/docproc.c
trunk/busybox/scripts/basic/fixdep.c
trunk/busybox/selinux/chcon.c
trunk/busybox/selinux/load_policy.c
trunk/busybox/selinux/runcon.c
trunk/busybox/shell/bbsh.c
trunk/busybox/util-linux/dmesg.c
trunk/busybox/util-linux/getopt.c
trunk/busybox/util-linux/mdev.c
trunk/busybox/util-linux/mkswap.c
trunk/busybox/util-linux/switch_root.c
Changeset:
Modified: trunk/busybox/applets/individual.c
===================================================================
--- trunk/busybox/applets/individual.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/applets/individual.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -11,7 +11,7 @@
#include <stdlib.h>
#include "usage.h"
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
{
applet_name = argv[0];
Modified: trunk/busybox/archival/libunarchive/decompress_bunzip2.c
===================================================================
--- trunk/busybox/archival/libunarchive/decompress_bunzip2.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/archival/libunarchive/decompress_bunzip2.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -719,7 +719,7 @@
"Out of memory","Obsolete (pre 0.9.5) bzip format not supported."};
/* Dumb little test thing, decompress stdin to stdout */
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
{
int i=uncompressStream(0,1);
char c;
Modified: trunk/busybox/console-tools/deallocvt.c
===================================================================
--- trunk/busybox/console-tools/deallocvt.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/console-tools/deallocvt.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -15,8 +15,8 @@
/* From <linux/vt.h> */
enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */
-int deallocvt_main(int argc, char *argv[]);
-int deallocvt_main(int argc, char *argv[])
+int deallocvt_main(int argc, char **argv);
+int deallocvt_main(int argc, char **argv)
{
/* num = 0 deallocate all unused consoles */
int num = 0;
Modified: trunk/busybox/coreutils/dos2unix.c
===================================================================
--- trunk/busybox/coreutils/dos2unix.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/coreutils/dos2unix.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -82,8 +82,8 @@
return 0;
}
-int dos2unix_main(int argc, char *argv[]);
-int dos2unix_main(int argc, char *argv[])
+int dos2unix_main(int argc, char **argv);
+int dos2unix_main(int argc, char **argv)
{
int o;
Modified: trunk/busybox/e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/fsck.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/e2fsprogs/fsck.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -1032,7 +1032,7 @@
}
}
-static void parse_args(int argc, char *argv[])
+static void parse_args(int argc, char **argv)
{
int i, j;
char *arg, *tmp;
@@ -1158,8 +1158,8 @@
cancel_requested = 1;
}
-int fsck_main(int argc, char *argv[]);
-int fsck_main(int argc, char *argv[])
+int fsck_main(int argc, char **argv);
+int fsck_main(int argc, char **argv)
{
int i, status = 0;
int interactive;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -13001,7 +13001,7 @@
}
-static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
+static errcode_t PRS(int argc, char **argv, e2fsck_t *ret_ctx)
{
int flush = 0;
int c, fd;
@@ -13202,8 +13202,8 @@
static const char my_ver_string[] = E2FSPROGS_VERSION;
static const char my_ver_date[] = E2FSPROGS_DATE;
-int e2fsck_main (int argc, char *argv[]);
-int e2fsck_main (int argc, char *argv[])
+int e2fsck_main (int argc, char **argv);
+int e2fsck_main (int argc, char **argv)
{
errcode_t retval;
int exit_value = EXIT_OK;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -1171,7 +1171,7 @@
cancel_requested++;
}
-static void PRS(int argc, char *argv[])
+static void PRS(int argc, char **argv)
{
int i, j;
char *arg, *dev, *tmp = 0;
@@ -1321,8 +1321,8 @@
max_running = atoi(tmp);
}
-int fsck_main(int argc, char *argv[]);
-int fsck_main(int argc, char *argv[])
+int fsck_main(int argc, char **argv);
+int fsck_main(int argc, char **argv)
{
int i, status = 0;
int interactive = 0;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -787,7 +787,7 @@
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER /* R/O compat */
};
-static int PRS(int argc, char *argv[])
+static int PRS(int argc, char **argv)
{
int c;
int size;
@@ -1175,8 +1175,8 @@
if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device);
}
-int mke2fs_main (int argc, char *argv[]);
-int mke2fs_main (int argc, char *argv[])
+int mke2fs_main (int argc, char **argv);
+int mke2fs_main (int argc, char **argv)
{
errcode_t retval;
ext2_filsys fs;
Modified: trunk/busybox/findutils/grep.c
===================================================================
--- trunk/busybox/findutils/grep.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/findutils/grep.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -396,7 +396,7 @@
invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
if (pattern_head != NULL) {
- /* convert char *argv[] to grep_list_data_t */
+ /* convert char **argv to grep_list_data_t */
llist_t *cur;
for (cur = pattern_head; cur; cur = cur->link)
Modified: trunk/busybox/init/halt.c
===================================================================
--- trunk/busybox/init/halt.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/init/halt.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -10,8 +10,8 @@
#include "busybox.h"
#include <sys/reboot.h>
-int halt_main(int argc, char *argv[]);
-int halt_main(int argc, char *argv[])
+int halt_main(int argc, char **argv);
+int halt_main(int argc, char **argv)
{
static const int magic[] = {
#ifdef RB_HALT_SYSTEM
Modified: trunk/busybox/init/mesg.c
===================================================================
--- trunk/busybox/init/mesg.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/init/mesg.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -15,8 +15,8 @@
#define S_IWGRP_OR_S_IWOTH (S_IWGRP | S_IWOTH)
#endif
-int mesg_main(int argc, char *argv[]);
-int mesg_main(int argc, char *argv[])
+int mesg_main(int argc, char **argv);
+int mesg_main(int argc, char **argv)
{
struct stat sb;
const char *tty;
Modified: trunk/busybox/miscutils/nmeter.c
===================================================================
--- trunk/busybox/miscutils/nmeter.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/miscutils/nmeter.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -729,8 +729,8 @@
init_cr,
};
-int nmeter_main(int argc, char* argv[]);
-int nmeter_main(int argc, char* argv[])
+int nmeter_main(int argc, char **argv);
+int nmeter_main(int argc, char **argv)
{
char buf[32];
s_stat *first = NULL;
Modified: trunk/busybox/miscutils/runlevel.c
===================================================================
--- trunk/busybox/miscutils/runlevel.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/miscutils/runlevel.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -18,8 +18,8 @@
#include <time.h>
#include <stdlib.h>
-int runlevel_main(int argc, char *argv[]);
-int runlevel_main(int argc, char *argv[])
+int runlevel_main(int argc, char **argv);
+int runlevel_main(int argc, char **argv)
{
struct utmp *ut;
char prev;
Modified: trunk/busybox/miscutils/setsid.c
===================================================================
--- trunk/busybox/miscutils/setsid.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/miscutils/setsid.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -16,8 +16,8 @@
#include "busybox.h"
-int setsid_main(int argc, char *argv[]);
-int setsid_main(int argc, char *argv[])
+int setsid_main(int argc, char **argv);
+int setsid_main(int argc, char **argv)
{
if (argc < 2)
bb_show_usage();
Modified: trunk/busybox/networking/ether-wake.c
===================================================================
--- trunk/busybox/networking/ether-wake.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/ether-wake.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -105,8 +105,8 @@
static inline int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast);
static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd);
-int ether_wake_main(int argc, char *argv[]);
-int ether_wake_main(int argc, char *argv[])
+int ether_wake_main(int argc, char **argv);
+int ether_wake_main(int argc, char **argv)
{
const char *ifname = "eth0";
char *pass = NULL;
Modified: trunk/busybox/networking/httpd.c
===================================================================
--- trunk/busybox/networking/httpd.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/httpd.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -1939,8 +1939,8 @@
};
-int httpd_main(int argc, char *argv[]);
-int httpd_main(int argc, char *argv[])
+int httpd_main(int argc, char **argv);
+int httpd_main(int argc, char **argv)
{
unsigned opt;
const char *home_httpd = home;
Modified: trunk/busybox/networking/inetd.c
===================================================================
--- trunk/busybox/networking/inetd.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/inetd.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -1248,8 +1248,8 @@
#endif
-int inetd_main(int argc, char *argv[]);
-int inetd_main(int argc, char *argv[])
+int inetd_main(int argc, char **argv);
+int inetd_main(int argc, char **argv)
{
servtab_t *sep;
struct passwd *pwd;
Modified: trunk/busybox/networking/traceroute.c
===================================================================
--- trunk/busybox/networking/traceroute.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/traceroute.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -915,8 +915,8 @@
#endif
-int traceroute_main(int argc, char *argv[]);
-int traceroute_main(int argc, char *argv[])
+int traceroute_main(int argc, char **argv);
+int traceroute_main(int argc, char **argv)
{
int code, n;
unsigned char *outp;
Modified: trunk/busybox/networking/udhcp/dhcpc.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpc.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/udhcp/dhcpc.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -132,8 +132,8 @@
}
-int udhcpc_main(int argc, char *argv[]);
-int udhcpc_main(int argc, char *argv[])
+int udhcpc_main(int argc, char **argv);
+int udhcpc_main(int argc, char **argv)
{
uint8_t *temp, *message;
char *str_c, *str_V, *str_h, *str_F, *str_r, *str_T, *str_t;
Modified: trunk/busybox/networking/udhcp/dhcpd.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpd.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/udhcp/dhcpd.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -21,8 +21,8 @@
struct server_config_t server_config;
-int udhcpd_main(int argc, char *argv[]);
-int udhcpd_main(int argc, char *argv[])
+int udhcpd_main(int argc, char **argv);
+int udhcpd_main(int argc, char **argv)
{
fd_set rfds;
struct timeval tv;
Modified: trunk/busybox/networking/udhcp/dumpleases.c
===================================================================
--- trunk/busybox/networking/udhcp/dumpleases.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/udhcp/dumpleases.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -7,8 +7,8 @@
#include "common.h"
#include "dhcpd.h"
-int dumpleases_main(int argc, char *argv[]);
-int dumpleases_main(int argc, char *argv[])
+int dumpleases_main(int argc, char **argv);
+int dumpleases_main(int argc, char **argv)
{
int fd;
int i;
Modified: trunk/busybox/networking/zcip.c
===================================================================
--- trunk/busybox/networking/zcip.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/networking/zcip.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -159,8 +159,8 @@
/**
* main program
*/
-int zcip_main(int argc, char *argv[]);
-int zcip_main(int argc, char *argv[])
+int zcip_main(int argc, char **argv);
+int zcip_main(int argc, char **argv)
{
int state = PROBE;
struct ether_addr eth_addr;
Modified: trunk/busybox/scripts/basic/docproc.c
===================================================================
--- trunk/busybox/scripts/basic/docproc.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/scripts/basic/docproc.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -331,7 +331,7 @@
}
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
{
FILE * infile;
if (argc != 3) {
Modified: trunk/busybox/scripts/basic/fixdep.c
===================================================================
--- trunk/busybox/scripts/basic/fixdep.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/scripts/basic/fixdep.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -386,7 +386,7 @@
*/
}
-int main(int argc, char *argv[])
+int main(int argc, char **argv)
{
traps();
Modified: trunk/busybox/selinux/chcon.c
===================================================================
--- trunk/busybox/selinux/chcon.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/selinux/chcon.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -120,8 +120,8 @@
};
#endif
-int chcon_main(int argc, char *argv[]);
-int chcon_main(int argc, char *argv[])
+int chcon_main(int argc, char **argv);
+int chcon_main(int argc, char **argv)
{
char *reference_file;
char *fname;
Modified: trunk/busybox/selinux/load_policy.c
===================================================================
--- trunk/busybox/selinux/load_policy.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/selinux/load_policy.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -5,8 +5,8 @@
*/
#include "busybox.h"
-int load_policy_main(int argc, char *argv[]);
-int load_policy_main(int argc, char *argv[])
+int load_policy_main(int argc, char **argv);
+int load_policy_main(int argc, char **argv)
{
int fd;
struct stat st;
Modified: trunk/busybox/selinux/runcon.c
===================================================================
--- trunk/busybox/selinux/runcon.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/selinux/runcon.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -87,8 +87,8 @@
#define OPTS_HELP (1<<5) /* h */
#define OPTS_CONTEXT_COMPONENT (OPTS_ROLE | OPTS_TYPE | OPTS_USER | OPTS_RANGE)
-int runcon_main(int argc, char *argv[]);
-int runcon_main(int argc, char *argv[])
+int runcon_main(int argc, char **argv);
+int runcon_main(int argc, char **argv)
{
char *role = NULL;
char *range = NULL;
Modified: trunk/busybox/shell/bbsh.c
===================================================================
--- trunk/busybox/shell/bbsh.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/shell/bbsh.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -198,8 +198,8 @@
}
}
-int bbsh_main(int argc, char *argv[]);
-int bbsh_main(int argc, char *argv[])
+int bbsh_main(int argc, char **argv);
+int bbsh_main(int argc, char **argv)
{
char *command=NULL;
FILE *f;
Modified: trunk/busybox/util-linux/dmesg.c
===================================================================
--- trunk/busybox/util-linux/dmesg.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/util-linux/dmesg.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -13,8 +13,8 @@
#include <unistd.h>
#include <sys/klog.h>
-int dmesg_main(int argc, char *argv[]);
-int dmesg_main(int argc, char *argv[])
+int dmesg_main(int argc, char **argv);
+int dmesg_main(int argc, char **argv)
{
char *size, *level;
int flags = getopt32(argc, argv, "cs:n:", &size, &level);
Modified: trunk/busybox/util-linux/getopt.c
===================================================================
--- trunk/busybox/util-linux/getopt.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/util-linux/getopt.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -55,7 +55,7 @@
/* Function prototypes */
static const char *normalize(const char *arg);
-static int generate_output(char * argv[],int argc,const char *optstr,
+static int generate_output(char **argv,int argc,const char *optstr,
const struct option *longopts);
static void add_long_options(char *options);
static void add_longopt(const char *name,int has_arg);
@@ -133,7 +133,7 @@
* optstr must contain the short options, and longopts the long options.
* Other settings are found in global variables.
*/
-int generate_output(char * argv[],int argc,const char *optstr,
+int generate_output(char **argv,int argc,const char *optstr,
const struct option *longopts)
{
int exit_code = 0; /* We assume everything will be OK */
@@ -288,8 +288,8 @@
static const char shortopts[]="+ao:l:n:qQs:Tu";
-int getopt_main(int argc, char *argv[]);
-int getopt_main(int argc, char *argv[])
+int getopt_main(int argc, char **argv);
+int getopt_main(int argc, char **argv)
{
const char *optstr = NULL;
char *name = NULL;
Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/util-linux/mdev.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -230,8 +230,8 @@
closedir(dir);
}
-int mdev_main(int argc, char *argv[]);
-int mdev_main(int argc, char *argv[])
+int mdev_main(int argc, char **argv);
+int mdev_main(int argc, char **argv)
{
char *action;
char *env_path;
Modified: trunk/busybox/util-linux/mkswap.c
===================================================================
--- trunk/busybox/util-linux/mkswap.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/util-linux/mkswap.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -8,8 +8,8 @@
#include "busybox.h"
-int mkswap_main(int argc, char *argv[]);
-int mkswap_main(int argc, char *argv[])
+int mkswap_main(int argc, char **argv);
+int mkswap_main(int argc, char **argv)
{
int fd, pagesize;
off_t len;
Modified: trunk/busybox/util-linux/switch_root.c
===================================================================
--- trunk/busybox/util-linux/switch_root.c 2007-04-04 20:29:15 UTC (rev 18326)
+++ trunk/busybox/util-linux/switch_root.c 2007-04-04 20:52:03 UTC (rev 18327)
@@ -63,8 +63,8 @@
} else unlink(directory);
}
-int switch_root_main(int argc, char *argv[]);
-int switch_root_main(int argc, char *argv[])
+int switch_root_main(int argc, char **argv);
+int switch_root_main(int argc, char **argv)
{
char *newroot, *console=NULL;
struct stat st1, st2;
More information about the busybox-cvs
mailing list