emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mdev: Rob's #if forest removal

Browse Source 
*: remove superfluous conts in "f(type *const param)"
This commit is contained in:
Denis Vlasenko 2009-04-19 01:27:20 +00:00
parent 885b6f29ae
commit c7cc5a9432
7 changed files with 141 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/stty.c
View File

@ -677,8 +677,8 @@ static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode)
return NULL; return NULL;
} }
static void set_speed_or_die(enum speed_setting type, const char *const arg, static void set_speed_or_die(enum speed_setting type, const char *arg,
struct termios * const mode) struct termios *mode)
{ {
speed_t baud; speed_t baud;
@ -801,7 +801,7 @@ enum {
param_ospeed = 8 | 0x80, param_ospeed = 8 | 0x80,
}; };
static int find_param(const char *const name) static int find_param(const char *name)
{ {
static const char params[] ALIGN1 = static const char params[] ALIGN1 =
"line\0" /* 1 */ "line\0" /* 1 */

4
editors/awk.c
View File

@ -521,8 +521,8 @@ static void zero_out_var(var * vp)
memset(vp, 0, sizeof(*vp)); memset(vp, 0, sizeof(*vp));
} }
static void syntax_error(const char *const message) NORETURN; static void syntax_error(const char *message) NORETURN;
static void syntax_error(const char *const message) static void syntax_error(const char *message)
{ {
bb_error_msg_and_die("%s:%i: %s", g_progname, g_lineno, message); bb_error_msg_and_die("%s:%i: %s", g_progname, g_lineno, message);
} }

2
libbb/parse_config.c
View File

@ -79,7 +79,7 @@ parser_t* FAST_FUNC config_open(const char *filename)
return config_open2(filename, fopen_or_warn_stdin); return config_open2(filename, fopen_or_warn_stdin);
} }
static void config_free_data(parser_t *const parser) static void config_free_data(parser_t *parser)
{ {
free(parser->line); free(parser->line);
parser->line = NULL; parser->line = NULL;

2
networking/libiproute/ll_map.c
View File

@ -133,7 +133,7 @@ unsigned ll_index_to_flags(int idx)
return 0; return 0;
} }
int xll_name_to_index(const char *const name) int xll_name_to_index(const char *name)
{ {
int ret = 0; int ret = 0;
int sock_fd; int sock_fd;

2
networking/libiproute/ll_map.h
View File

@ -6,7 +6,7 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
int ll_init_map(struct rtnl_handle *rth); int ll_init_map(struct rtnl_handle *rth);
int xll_name_to_index(const char *const name); int xll_name_to_index(const char *name);
const char *ll_index_to_name(int idx); const char *ll_index_to_name(int idx);
const char *ll_idx_n2a(int idx, char *buf); const char *ll_idx_n2a(int idx, char *buf);
/* int ll_index_to_type(int idx); */ /* int ll_index_to_type(int idx); */

2
selinux/setfiles.c
View File

@ -112,7 +112,7 @@ static void inc_err(void)
} }
} }
static void add_exclude(const char *const directory) static void add_exclude(const char *directory)
{ {
struct stat sb; struct stat sb;
size_t len; size_t len;

296
util-linux/mdev.c
View File

@ -52,7 +52,7 @@ struct globals {
#define G (*(struct globals*)&bb_common_bufsiz1) #define G (*(struct globals*)&bb_common_bufsiz1)
#define root_major (G.root_major) #define root_major (G.root_major)
#define root_minor (G.root_minor) #define root_minor (G.root_minor)
#define subsystem (G.subsystem) #define subsystem (G.subsystem )
/* Prevent infinite loops in /sys symlinks */ /* Prevent infinite loops in /sys symlinks */
#define MAX_SYSFS_DEPTH 3 #define MAX_SYSFS_DEPTH 3
@ -60,9 +60,9 @@ struct globals {
/* We use additional 64+ bytes in make_device() */ /* We use additional 64+ bytes in make_device() */
#define SCRATCH_SIZE 80 #define SCRATCH_SIZE 80
#if ENABLE_FEATURE_MDEV_RENAME
/* Builds an alias path. /* Builds an alias path.
* This function potentionally reallocates the alias parameter. * This function potentionally reallocates the alias parameter.
* Only used for ENABLE_FEATURE_MDEV_RENAME
*/ */
static char *build_alias(char *alias, const char *device_name) static char *build_alias(char *alias, const char *device_name)
{ {
@ -84,19 +84,16 @@ static char *build_alias(char *alias, const char *device_name)
return alias; return alias;
} }
#endif
/* mknod in /dev based on a path like "/sys/block/hda/hda1" */ /* mknod in /dev based on a path like "/sys/block/hda/hda1" */
/* NB: "mdev -s" may call us many times, do not leak memory/fds! */ /* NB: "mdev -s" may call us many times, do not leak memory/fds! */
static void make_device(char *path, int delete) static void make_device(char *path, int delete)
{ {
#if ENABLE_FEATURE_MDEV_CONF
parser_t *parser;
#endif
const char *device_name; const char *device_name;
int major, minor, type, len; int major, minor, type, len;
int mode; int mode;
char *dev_maj_min = path + strlen(path); char *dev_maj_min = path + strlen(path);
parser_t *parser;
/* Force the configuration file settings exactly. */ /* Force the configuration file settings exactly. */
umask(0); umask(0);
@ -137,170 +134,153 @@ static void make_device(char *path, int delete)
else else
path += sizeof("/sys/class/") - 1; path += sizeof("/sys/class/") - 1;
#if !ENABLE_FEATURE_MDEV_CONF
mode = 0660;
#else
/* If we have config file, look up user settings */ /* If we have config file, look up user settings */
parser = config_open2("/etc/mdev.conf", fopen_for_read); if (ENABLE_FEATURE_MDEV_CONF)
while (1) { parser = config_open2("/etc/mdev.conf", fopen_for_read);
do {
regmatch_t off[1 + 9 * ENABLE_FEATURE_MDEV_RENAME_REGEXP]; regmatch_t off[1 + 9 * ENABLE_FEATURE_MDEV_RENAME_REGEXP];
int keep_matching; int keep_matching;
char *val, *name; char *val, *name;
struct bb_uidgid_t ugid; struct bb_uidgid_t ugid;
char *tokens[4]; char *tokens[4];
# if ENABLE_FEATURE_MDEV_EXEC
char *command = NULL; char *command = NULL;
# endif
# if ENABLE_FEATURE_MDEV_RENAME
char *alias = NULL; char *alias = NULL;
char aliaslink = aliaslink; /* for compiler */ char aliaslink = aliaslink; /* for compiler */
# endif
/* Defaults in case we won't match any line */ /* Defaults in case we won't match any line */
ugid.uid = ugid.gid = 0; ugid.uid = ugid.gid = 0;
keep_matching = 0; keep_matching = 0;
mode = 0660; mode = 0660;
if (!config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) { if (ENABLE_FEATURE_MDEV_CONF
/* End of file, create dev node with default params */ && config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)
goto line_matches; ) {
} val = tokens[0];
keep_matching = ('-' == val[0]);
val += keep_matching; /* swallow leading dash */
val = tokens[0]; /* Match against either "subsystem/device_name"
keep_matching = ('-' == val[0]); * or "device_name" alone */
val += keep_matching; /* swallow leading dash */ name = strchr(val, '/') ? path : (char *) device_name;
/* Match against either "subsystem/device_name" /* Fields: regex uid:gid mode [alias] [cmd] */
* or "device_name" alone */
name = strchr(val, '/') ? path : (char *) device_name;
/* Fields: regex uid:gid mode [alias] [cmd] */ /* 1st field: @<numeric maj,min>... */
if (val[0] == '@') {
/* @major,minor[-last] */
/* (useful when name is ambiguous:
* "/sys/class/usb/lp0" and
* "/sys/class/printer/lp0") */
int cmaj, cmin0, cmin1, sc;
if (major < 0)
continue; /* no dev, no match */
sc = sscanf(val, "@%u,%u-%u", &cmaj, &cmin0, &cmin1);
if (sc < 1 || major != cmaj
|| (sc == 2 && minor != cmin0)
|| (sc == 3 && (minor < cmin0 || minor > cmin1))
) {
continue; /* this line doesn't match */
}
} else { /* ... or regex to match device name */
regex_t match;
int result;
/* 1st field: @<numeric maj,min>... */ /* Is this it? */
if (val[0] == '@') { xregcomp(&match, val, REG_EXTENDED);
/* @major,minor[-last] */ result = regexec(&match, name, ARRAY_SIZE(off), off, 0);
/* (useful when name is ambiguous: regfree(&match);
* "/sys/class/usb/lp0" and
* "/sys/class/printer/lp0") */ //bb_error_msg("matches:");
int cmaj, cmin0, cmin1, sc; //for (int i = 0; i < ARRAY_SIZE(off); i++) {
if (major < 0) // if (off[i].rm_so < 0) continue;
continue; /* no dev, no match */ // bb_error_msg("match %d: '%.*s'\n", i,
sc = sscanf(val, "@%u,%u-%u", &cmaj, &cmin0, &cmin1); // (int)(off[i].rm_eo - off[i].rm_so),
if (sc < 1 || major != cmaj // device_name + off[i].rm_so);
|| (sc == 2 && minor != cmin0) //}
|| (sc == 3 && (minor < cmin0 || minor > cmin1))
) { /* If not this device, skip rest of line */
continue; /* this line doesn't match */ /* (regexec returns whole pattern as "range" 0) */
if (result || off[0].rm_so
|| ((int)off[0].rm_eo != (int)strlen(name))
) {
continue; /* this line doesn't match */
}
} }
} else { /* ... or regex to match device name */
regex_t match;
int result;
/* Is this it? */ /* This line matches: stop parsing the file after parsing
xregcomp(&match, val, REG_EXTENDED); * the rest of fields unless keep_matching == 1 */
result = regexec(&match, name, ARRAY_SIZE(off), off, 0);
regfree(&match);
//bb_error_msg("matches:"); /* 2nd field: uid:gid - device ownership */
//for (int i = 0; i < ARRAY_SIZE(off); i++) { parse_chown_usergroup_or_die(&ugid, tokens[1]);
// if (off[i].rm_so < 0) continue;
// bb_error_msg("match %d: '%.*s'\n", i,
// (int)(off[i].rm_eo - off[i].rm_so),
// device_name + off[i].rm_so);
//}
/* If not this device, skip rest of line */ /* 3rd field: mode - device permissions */
/* (regexec returns whole pattern as "range" 0) */ mode = strtoul(tokens[2], NULL, 8);
if (result || off[0].rm_so
|| ((int)off[0].rm_eo != (int)strlen(name))
) {
continue; /* this line doesn't match */
}
}
/* This line matches: stop parsing the file after parsing val = tokens[3];
* the rest of fields unless keep_matching == 1 */ /* 4th field (opt): >|=alias */
/* 2nd field: uid:gid - device ownership */ if (ENABLE_FEATURE_MDEV_RENAME && val) {
parse_chown_usergroup_or_die(&ugid, tokens[1]); aliaslink = val[0];
if (aliaslink == '>' || aliaslink == '=') {
char *a, *s, *st;
char *p;
unsigned i, n;
/* 3rd field: mode - device permissions */ a = val;
mode = strtoul(tokens[2], NULL, 8); s = strchrnul(val, ' ');
st = strchrnul(val, '\t');
if (st < s)
s = st;
val = (s[0] && s[1]) ? s+1 : NULL;
s[0] = '\0';
val = tokens[3]; if (ENABLE_FEATURE_MDEV_RENAME_REGEXP) {
/* 4th field (opt): >|=alias */ /* substitute %1..9 with off[1..9], if any */
# if ENABLE_FEATURE_MDEV_RENAME n = 0;
if (!val) s = a;
goto line_matches; while (*s)
aliaslink = val[0]; if (*s++ == '%')
if (aliaslink == '>' || aliaslink == '=') { n++;
char *a, *s, *st;
# if ENABLE_FEATURE_MDEV_RENAME_REGEXP
char *p;
unsigned i, n;
# endif
a = val;
s = strchrnul(val, ' ');
st = strchrnul(val, '\t');
if (st < s)
s = st;
val = (s[0] && s[1]) ? s+1 : NULL;
s[0] = '\0';
# if ENABLE_FEATURE_MDEV_RENAME_REGEXP p = alias = xzalloc(strlen(a) + n * strlen(name));
/* substitute %1..9 with off[1..9], if any */ s = a + 1;
n = 0; while (*s) {
s = a; *p = *s;
while (*s) if ('%' == *s) {
if (*s++ == '%') i = (s[1] - '0');
n++; if (i <= 9 && off[i].rm_so >= 0) {
n = off[i].rm_eo - off[i].rm_so;
p = alias = xzalloc(strlen(a) + n * strlen(name)); strncpy(p, name + off[i].rm_so, n);
s = a + 1; p += n - 1;
while (*s) { s++;
*p = *s; }
if ('%' == *s) { }
i = (s[1] - '0'); p++;
if (i <= 9 && off[i].rm_so >= 0) { s++;
n = off[i].rm_eo - off[i].rm_so; }
strncpy(p, name + off[i].rm_so, n); } else {
p += n - 1; alias = xstrdup(a + 1);
s++;
} }
} }
p++;
s++;
} }
# else
alias = xstrdup(a + 1);
# endif
}
# endif /* ENABLE_FEATURE_MDEV_RENAME */
# if ENABLE_FEATURE_MDEV_EXEC if (ENABLE_FEATURE_MDEV_EXEC && val) {
/* The rest (opt): @|$|*command */ const char *s = "$@*";
if (!val) const char *s2 = strchr(s, val[0]);
goto line_matches;
{
const char *s = "@$*";
const char *s2 = strchr(s, val[0]);
if (!s2) if (!s2)
bb_error_msg_and_die("bad line %u", parser->lineno); bb_error_msg_and_die("bad line %u", parser->lineno);
/* Correlate the position in the "@$*" with the delete /* Are we running this command now?
* step so that we get the proper behavior: * Run $cmd on delete, @cmd on create, *cmd on both
* @cmd: run on create */
* $cmd: run on delete if (s2-s != delete)
* *cmd: run on both command = xstrdup(val + 1);
*/
if ((s2 - s + 1) /*1/2/3*/ & /*1/2*/ (1 + delete)) {
command = xstrdup(val + 1);
} }
} }
# endif
/* End of field parsing */ /* End of field parsing */
line_matches:
#endif /* ENABLE_FEATURE_MDEV_CONF */
/* "Execute" the line we found */ /* "Execute" the line we found */
@ -311,11 +291,11 @@ static void make_device(char *path, int delete)
bb_perror_msg_and_die("mknod %s", device_name); bb_perror_msg_and_die("mknod %s", device_name);
if (major == root_major && minor == root_minor) if (major == root_major && minor == root_minor)
symlink(device_name, "root"); symlink(device_name, "root");
#if ENABLE_FEATURE_MDEV_CONF if (ENABLE_FEATURE_MDEV_CONF) {
chmod(device_name, mode); chmod(device_name, mode);
chown(device_name, ugid.uid, ugid.gid); chown(device_name, ugid.uid, ugid.gid);
# if ENABLE_FEATURE_MDEV_RENAME }
if (alias) { if (ENABLE_FEATURE_MDEV_RENAME && alias) {
alias = build_alias(alias, device_name); alias = build_alias(alias, device_name);
/* move the device, and optionally /* move the device, and optionally
* make a symlink to moved device node */ * make a symlink to moved device node */
@ -323,11 +303,9 @@ static void make_device(char *path, int delete)
symlink(alias, device_name); symlink(alias, device_name);
free(alias); free(alias);
} }
# endif
#endif
} }
#if ENABLE_FEATURE_MDEV_EXEC
if (command) { if (ENABLE_FEATURE_MDEV_EXEC && command) {
/* setenv will leak memory, use putenv/unsetenv/free */ /* setenv will leak memory, use putenv/unsetenv/free */
char *s = xasprintf("%s=%s", "MDEV", device_name); char *s = xasprintf("%s=%s", "MDEV", device_name);
char *s1 = xasprintf("%s=%s", "SUBSYSTEM", subsystem); char *s1 = xasprintf("%s=%s", "SUBSYSTEM", subsystem);
@ -341,29 +319,29 @@ static void make_device(char *path, int delete)
free(s); free(s);
free(command); free(command);
} }
#endif
if (delete) { if (delete) {
unlink(device_name); unlink(device_name);
/* At creation time, device might have been moved /* At creation time, device might have been moved
* and a symlink might have been created. Undo that. */ * and a symlink might have been created. Undo that. */
#if ENABLE_FEATURE_MDEV_RENAME
if (alias) { if (ENABLE_FEATURE_MDEV_RENAME && alias) {
alias = build_alias(alias, device_name); alias = build_alias(alias, device_name);
unlink(alias); unlink(alias);
free(alias); free(alias);
} }
#endif
} }
#if ENABLE_FEATURE_MDEV_CONF
/* We found matching line. /* We found matching line.
* Stop unless it was prefixed with '-' */ * Stop unless it was prefixed with '-' */
if (!keep_matching) if (ENABLE_FEATURE_MDEV_CONF && !keep_matching)
break; break;
} /* end of "while line is read from /etc/mdev.conf" */
config_close(parser); /* end of "while line is read from /etc/mdev.conf" */
#endif /* ENABLE_FEATURE_MDEV_CONF */ } while (ENABLE_FEATURE_MDEV_CONF);
if (ENABLE_FEATURE_MDEV_CONF)
config_close(parser);
} }
/* File callback for /sys/ traversal */ /* File callback for /sys/ traversal */
@ -415,7 +393,7 @@ static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM,
* - userspace writes "0" (worked) or "-1" (failed) to /sys/$DEVPATH/loading * - userspace writes "0" (worked) or "-1" (failed) to /sys/$DEVPATH/loading
* - kernel loads firmware into device * - kernel loads firmware into device
*/ */
static void load_firmware(const char *const firmware, const char *const sysfs_path) static void load_firmware(const char *firmware, const char *sysfs_path)
{ {
int cnt; int cnt;
int firmware_fd, loading_fd, data_fd; int firmware_fd, loading_fd, data_fd;
@ -469,18 +447,8 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
/* We can be called as hotplug helper */ /* We can be called as hotplug helper */
/* Kernel cannot provide suitable stdio fds for us, do it ourself */ /* Kernel cannot provide suitable stdio fds for us, do it ourself */
#if 1
bb_sanitize_stdio(); bb_sanitize_stdio();
#else
/* Debug code */
/* Replace LOGFILE by other file or device name if you need */
#define LOGFILE "/dev/console"
/* Just making sure fd 0 is not closed,
* we don't really intend to read from it */
xmove_fd(xopen("/", O_RDONLY), STDIN_FILENO);
xmove_fd(xopen(LOGFILE, O_WRONLY|O_APPEND), STDOUT_FILENO);
xmove_fd(xopen(LOGFILE, O_WRONLY|O_APPEND), STDERR_FILENO);
#endif
xchdir("/dev"); xchdir("/dev");