Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-27 07:28:31 +00:00
Code Issues Projects Releases Wiki Activity

sysctl: move code around to get rid of forward references.

Browse Source 
(incidentally it helps gcc to make code smaller)
This commit is contained in:
Denis Vlasenko 2009-03-29 02:23:16 +00:00
parent 5a6617acb8
commit 038fe44713
1 changed files with 101 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
procps/sysctl.c
View File

@ -7,20 +7,12 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* *
* Changelog: * Changelog:
* v1.01: * v1.01 - added -p <preload> to preload values from a file
* - added -p <preload> to preload values from a file * v1.01.1 - busybox applet aware by <solar@gentoo.org>
* v1.01.1
* - busybox applet aware by <solar@gentoo.org>
*
*/ */
#include "libbb.h" #include "libbb.h"
static int sysctl_act_on_setting(char *setting);
static int sysctl_display_all(const char *path);
static int sysctl_handle_preload_file(const char *filename);
static void sysctl_dots_to_slashes(char *name);
enum { enum {
FLAG_SHOW_KEYS = 1 << 0, FLAG_SHOW_KEYS = 1 << 0,
FLAG_SHOW_KEY_ERRORS = 1 << 1, FLAG_SHOW_KEY_ERRORS = 1 << 1,
@ -29,67 +21,52 @@ enum {
FLAG_PRELOAD_FILE = 1 << 4, FLAG_PRELOAD_FILE = 1 << 4,
FLAG_WRITE = 1 << 5, FLAG_WRITE = 1 << 5,
}; };
#define OPTION_STR "neAapw"
int sysctl_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; static void sysctl_dots_to_slashes(char *name)
int sysctl_main(int argc UNUSED_PARAM, char **argv)
{ {
int retval; char *cptr, *last_good, *end;
int opt;
opt = getopt32(argv, "+neAapw"); /* '+' - stop on first non-option */ /* Convert minimum number of '.' to '/' so that
argv += optind; * we end up with existing file's name.
opt ^= (FLAG_SHOW_KEYS | FLAG_SHOW_KEY_ERRORS); *
option_mask32 = opt; * Example from bug 3894:
* net.ipv4.conf.eth0.100.mc_forwarding ->
if (opt & FLAG_PRELOAD_FILE) { * net/ipv4/conf/eth0.100/mc_forwarding
option_mask32 |= FLAG_WRITE; * NB: net/ipv4/conf/eth0/mc_forwarding *also exists*,
/* xchdir("/proc/sys") is inside */ * therefore we must start from the end, and if
return sysctl_handle_preload_file(*argv ? *argv : "/etc/sysctl.conf"); * we replaced even one . -> /, start over again,
} * but never replace dots before the position
xchdir("/proc/sys"); * where last replacement occurred.
/* xchroot(".") - if you are paranoid */ *
if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) { * Another bug we later had is that
return sysctl_display_all("."); * net.ipv4.conf.eth0.100
} * (without .mc_forwarding) was mishandled.
*
retval = 0; * To set up testing: modprobe 8021q; vconfig add eth0 100
while (*argv) {
sysctl_dots_to_slashes(*argv);
retval |= sysctl_display_all(*argv);
argv++;
}
return retval;
}
/* Set sysctl's from a conf file. Format example:
* # Controls IP packet forwarding
* net.ipv4.ip_forward = 0
*/ */
static int sysctl_handle_preload_file(const char *filename) end = name + strlen(name);
{ last_good = name - 1;
char *token[2]; *end = '.'; /* trick the loop into trying full name too */
parser_t *parser;
parser = config_open(filename); again:
/* Must do it _after_ config_open(): */ cptr = end;
xchdir("/proc/sys"); while (cptr > last_good) {
/* xchroot(".") - if you are paranoid */ if (*cptr == '.') {
*cptr = '\0';
//TODO: ';' is comment char too //bb_error_msg("trying:'%s'", name);
//TODO: comment may be only at line start. "var=1 #abc" - "1 #abc" is the value if (access(name, F_OK) == 0) {
// (but _whitespace_ from ends should be trimmed first (and we do it right)) if (cptr != end) /* prevent trailing '/' */
//TODO: "var==1" is mishandled (must use "=1" as a value, but uses "1") *cptr = '/';
while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) { //bb_error_msg("replaced:'%s'", name);
sysctl_dots_to_slashes(token[0]); last_good = cptr;
/* Save ~4 bytes by using parser internals */ goto again;
/* parser->line is big enough for sprintf */
sprintf(parser->line, "%s=%s", token[0], token[1]);
sysctl_display_all(parser->line);
} }
if (ENABLE_FEATURE_CLEAN_UP) *cptr = '.';
config_close(parser); }
return 0; cptr--;
}
*end = '\0';
} }
static int sysctl_act_on_setting(char *setting) static int sysctl_act_on_setting(char *setting)
@ -186,7 +163,7 @@ static int sysctl_act_on_setting(char *setting)
return retval; return retval;
} }
static int sysctl_display_all(const char *path) static int sysctl_act_recursive(const char *path)
{ {
DIR *dirp; DIR *dirp;
struct stat buf; struct stat buf;
@ -204,7 +181,7 @@ static int sysctl_display_all(const char *path)
if (next == NULL) if (next == NULL)
continue; /* d_name is "." or ".." */ continue; /* d_name is "." or ".." */
/* if path was ".", drop "./" prefix: */ /* if path was ".", drop "./" prefix: */
retval |= sysctl_display_all((next[0] == '.' && next[1] == '/') ? retval |= sysctl_act_recursive((next[0] == '.' && next[1] == '/') ?
next + 2 : next); next + 2 : next);
free(next); free(next);
} }
@ -218,48 +195,64 @@ static int sysctl_display_all(const char *path)
return retval; return retval;
} }
static void sysctl_dots_to_slashes(char *name) /* Set sysctl's from a conf file. Format example:
{ * # Controls IP packet forwarding
char *cptr, *last_good, *end; * net.ipv4.ip_forward = 0
/* Convert minimum number of '.' to '/' so that
* we end up with existing file's name.
*
* Example from bug 3894:
* net.ipv4.conf.eth0.100.mc_forwarding ->
* net/ipv4/conf/eth0.100/mc_forwarding
* NB: net/ipv4/conf/eth0/mc_forwarding *also exists*,
* therefore we must start from the end, and if
* we replaced even one . -> /, start over again,
* but never replace dots before the position
* where last replacement occurred.
*
* Another bug we later had is that
* net.ipv4.conf.eth0.100
* (without .mc_forwarding) was mishandled.
*
* To set up testing: modprobe 8021q; vconfig add eth0 100
*/ */
end = name + strlen(name); static int sysctl_handle_preload_file(const char *filename)
last_good = name - 1; {
*end = '.'; /* trick the loop into trying full name too */ char *token[2];
parser_t *parser;
again: parser = config_open(filename);
cptr = end; /* Must do it _after_ config_open(): */
while (cptr > last_good) { xchdir("/proc/sys");
if (*cptr == '.') { /* xchroot(".") - if you are paranoid */
*cptr = '\0';
//bb_error_msg("trying:'%s'", name); //TODO: ';' is comment char too
if (access(name, F_OK) == 0) { //TODO: comment may be only at line start. "var=1 #abc" - "1 #abc" is the value
if (cptr != end) /* prevent trailing '/' */ // (but _whitespace_ from ends should be trimmed first (and we do it right))
*cptr = '/'; //TODO: "var==1" is mishandled (must use "=1" as a value, but uses "1")
//bb_error_msg("replaced:'%s'", name); while (config_read(parser, token, 2, 2, "# \t=", PARSE_NORMAL)) {
last_good = cptr; sysctl_dots_to_slashes(token[0]);
goto again; /* Save ~4 bytes by using parser internals */
/* parser->line is big enough for sprintf */
sprintf(parser->line, "%s=%s", token[0], token[1]);
sysctl_act_recursive(parser->line);
} }
*cptr = '.'; if (ENABLE_FEATURE_CLEAN_UP)
} config_close(parser);
cptr--; return 0;
} }
*end = '\0';
int sysctl_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int sysctl_main(int argc UNUSED_PARAM, char **argv)
{
int retval;
int opt;
opt = getopt32(argv, "+" OPTION_STR); /* '+' - stop on first non-option */
argv += optind;
opt ^= (FLAG_SHOW_KEYS | FLAG_SHOW_KEY_ERRORS);
option_mask32 = opt;
if (opt & FLAG_PRELOAD_FILE) {
option_mask32 |= FLAG_WRITE;
/* xchdir("/proc/sys") is inside */
return sysctl_handle_preload_file(*argv ? *argv : "/etc/sysctl.conf");
}
xchdir("/proc/sys");
/* xchroot(".") - if you are paranoid */
if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) {
return sysctl_act_recursive(".");
}
retval = 0;
while (*argv) {
sysctl_dots_to_slashes(*argv);
retval |= sysctl_act_recursive(*argv);
argv++;
}
return retval;
} }