mirror of
https://github.com/sheumann/hush.git
synced 2024-10-01 18:57:10 +00:00
mdev: reduce excessive indentation
This commit is contained in:
Denis Vlasenko
parent
4e33e07f60
commit
f46be09106
@ -25,7 +25,7 @@ struct mdev_globals
|
||||
static void make_device(char *path, int delete)
|
||||
{
|
||||
char *device_name;
|
||||
int major, minor, type, len, fd;
|
||||
int major, minor, type, len;
|
||||
int mode = 0660;
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
@ -53,119 +53,125 @@ static void make_device(char *path, int delete)
|
||||
|
||||
if (ENABLE_FEATURE_MDEV_CONF) {
|
||||
char *conf, *pos, *end;
|
||||
int line, fd;
|
||||
|
||||
/* mmap the config file */
|
||||
if (-1 != (fd=open("/etc/mdev.conf",O_RDONLY))) {
|
||||
len = lseek(fd, 0, SEEK_END);
|
||||
conf = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
|
||||
if (conf) {
|
||||
int line = 0;
|
||||
fd = open("/etc/mdev.conf", O_RDONLY);
|
||||
if (fd < 0)
|
||||
goto end_parse;
|
||||
len = xlseek(fd, 0, SEEK_END);
|
||||
conf = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
|
||||
close(fd);
|
||||
if (!conf)
|
||||
goto end_parse;
|
||||
|
||||
/* Loop through lines in mmaped file*/
|
||||
for (pos=conf; pos-conf<len;) {
|
||||
int field;
|
||||
char *end2;
|
||||
line = 0;
|
||||
/* Loop through lines in mmaped file*/
|
||||
for (pos=conf; pos-conf<len;) {
|
||||
int field;
|
||||
char *end2;
|
||||
|
||||
line++;
|
||||
/* find end of this line */
|
||||
for(end=pos; end-conf<len && *end!='\n'; end++)
|
||||
;
|
||||
line++;
|
||||
/* find end of this line */
|
||||
for(end=pos; end-conf<len && *end!='\n'; end++)
|
||||
;
|
||||
|
||||
/* Three fields: regex, uid:gid, mode */
|
||||
for (field=0; field < (3 + ENABLE_FEATURE_MDEV_EXEC);
|
||||
field++)
|
||||
{
|
||||
/* Skip whitespace */
|
||||
while (pos<end && isspace(*pos)) pos++;
|
||||
if (pos==end || *pos=='#') break;
|
||||
for (end2=pos;
|
||||
end2<end && !isspace(*end2) && *end2!='#'; end2++)
|
||||
;
|
||||
/* Three fields: regex, uid:gid, mode */
|
||||
for (field=0; field < (3 + ENABLE_FEATURE_MDEV_EXEC);
|
||||
field++)
|
||||
{
|
||||
/* Skip whitespace */
|
||||
while (pos<end && isspace(*pos)) pos++;
|
||||
if (pos==end || *pos=='#') break;
|
||||
for (end2=pos;
|
||||
end2<end && !isspace(*end2) && *end2!='#'; end2++)
|
||||
;
|
||||
|
||||
if (!field) {
|
||||
/* Regex to match this device */
|
||||
if (field == 0) {
|
||||
/* Regex to match this device */
|
||||
|
||||
char *regex = strndupa(pos, end2-pos);
|
||||
regex_t match;
|
||||
regmatch_t off;
|
||||
int result;
|
||||
char *regex = strndupa(pos, end2-pos);
|
||||
regex_t match;
|
||||
regmatch_t off;
|
||||
int result;
|
||||
|
||||
/* Is this it? */
|
||||
xregcomp(&match,regex, REG_EXTENDED);
|
||||
result = regexec(&match, device_name, 1, &off, 0);
|
||||
regfree(&match);
|
||||
/* Is this it? */
|
||||
xregcomp(&match,regex, REG_EXTENDED);
|
||||
result = regexec(&match, device_name, 1, &off, 0);
|
||||
regfree(&match);
|
||||
|
||||
/* If not this device, skip rest of line */
|
||||
if (result || off.rm_so
|
||||
|| off.rm_eo != strlen(device_name))
|
||||
break;
|
||||
|
||||
} else if (field == 1) {
|
||||
/* uid:gid */
|
||||
|
||||
char *s, *s2;
|
||||
|
||||
/* Find : */
|
||||
for(s=pos; s<end2 && *s!=':'; s++)
|
||||
;
|
||||
if (s == end2) break;
|
||||
|
||||
/* Parse UID */
|
||||
uid = strtoul(pos,&s2,10);
|
||||
if (s != s2) {
|
||||
struct passwd *pass;
|
||||
pass = getpwnam(strndupa(pos, s-pos));
|
||||
if (!pass) break;
|
||||
uid = pass->pw_uid;
|
||||
}
|
||||
s++;
|
||||
/* parse GID */
|
||||
gid = strtoul(s, &s2, 10);
|
||||
if (end2 != s2) {
|
||||
struct group *grp;
|
||||
grp = getgrnam(strndupa(s, end2-s));
|
||||
if (!grp) break;
|
||||
gid = grp->gr_gid;
|
||||
}
|
||||
} else if (field == 2) {
|
||||
/* mode */
|
||||
|
||||
mode = strtoul(pos, &pos, 8);
|
||||
if (pos != end2) break;
|
||||
} else if (ENABLE_FEATURE_MDEV_EXEC && field == 3) {
|
||||
// Command to run
|
||||
char *s = "@$*", *s2;
|
||||
if (!(s2 = strchr(s, *pos++))) {
|
||||
// Force error
|
||||
field = 1;
|
||||
break;
|
||||
}
|
||||
if ((s2-s+1) & (1<<delete))
|
||||
command = xstrndup(pos, end-pos);
|
||||
}
|
||||
|
||||
pos = end2;
|
||||
}
|
||||
|
||||
/* Did everything parse happily? */
|
||||
|
||||
if (field > 2) break;
|
||||
if (field) bb_error_msg_and_die("Bad line %d",line);
|
||||
|
||||
/* Next line */
|
||||
pos = ++end;
|
||||
/* If not this device, skip rest of line */
|
||||
if (result || off.rm_so
|
||||
|| off.rm_eo != strlen(device_name))
|
||||
break;
|
||||
}
|
||||
munmap(conf, len);
|
||||
if (field == 1) {
|
||||
/* uid:gid */
|
||||
|
||||
char *s, *s2;
|
||||
|
||||
/* Find : */
|
||||
for(s=pos; s<end2 && *s!=':'; s++)
|
||||
;
|
||||
if (s == end2) break;
|
||||
|
||||
/* Parse UID */
|
||||
uid = strtoul(pos, &s2, 10);
|
||||
if (s != s2) {
|
||||
struct passwd *pass;
|
||||
pass = getpwnam(strndupa(pos, s-pos));
|
||||
if (!pass) break;
|
||||
uid = pass->pw_uid;
|
||||
}
|
||||
s++;
|
||||
/* parse GID */
|
||||
gid = strtoul(s, &s2, 10);
|
||||
if (end2 != s2) {
|
||||
struct group *grp;
|
||||
grp = getgrnam(strndupa(s, end2-s));
|
||||
if (!grp) break;
|
||||
gid = grp->gr_gid;
|
||||
}
|
||||
}
|
||||
if (field == 2) {
|
||||
/* mode */
|
||||
|
||||
mode = strtoul(pos, &pos, 8);
|
||||
if (pos != end2) break;
|
||||
}
|
||||
if (ENABLE_FEATURE_MDEV_EXEC && field == 3) {
|
||||
// Command to run
|
||||
char *s = "@$*", *s2;
|
||||
s2 = strchr(s, *pos++);
|
||||
if (!s2) {
|
||||
// Force error
|
||||
field = 1;
|
||||
break;
|
||||
}
|
||||
if ((s2-s+1) & (1<<delete))
|
||||
command = xstrndup(pos, end-pos);
|
||||
}
|
||||
|
||||
pos = end2;
|
||||
}
|
||||
close(fd);
|
||||
|
||||
/* Did everything parse happily? */
|
||||
|
||||
if (field > 2) break;
|
||||
if (field) bb_error_msg_and_die("bad line %d",line);
|
||||
|
||||
/* Next line */
|
||||
pos = ++end;
|
||||
}
|
||||
munmap(conf, len);
|
||||
end_parse: /* nothing */ ;
|
||||
}
|
||||
|
||||
umask(0);
|
||||
if (!delete) {
|
||||
if (sscanf(temp, "%d:%d", &major, &minor) != 2) return;
|
||||
if (mknod(device_name, mode | type, makedev(major, minor)) && errno != EEXIST)
|
||||
bb_perror_msg_and_die("mknod %s failed", device_name);
|
||||
bb_perror_msg_and_die("mknod %s", device_name);
|
||||
|
||||
if (major == bbg.root_major && minor == bbg.root_minor)
|
||||
symlink(device_name, "root");
|
||||
@ -176,10 +182,10 @@ static void make_device(char *path, int delete)
|
||||
int rc;
|
||||
char *s;
|
||||
|
||||
s=xasprintf("MDEV=%s",device_name);
|
||||
s = xasprintf("MDEV=%s", device_name);
|
||||
putenv(s);
|
||||
rc = system(command);
|
||||
s[4]=0;
|
||||
s[4] = 0;
|
||||
putenv(s);
|
||||
free(s);
|
||||
free(command);
|
||||
@ -197,7 +203,8 @@ static void find_dev(char *path)
|
||||
size_t len = strlen(path);
|
||||
struct dirent *entry;
|
||||
|
||||
if ((dir = opendir(path)) == NULL)
|
||||
dir = opendir(path);
|
||||
if (dir == NULL)
|
||||
return;
|
||||
|
||||
while ((entry = readdir(dir)) != NULL) {
|
||||
@ -235,9 +242,9 @@ int mdev_main(int argc, char *argv[])
|
||||
if (argc == 2 && !strcmp(argv[1],"-s")) {
|
||||
struct stat st;
|
||||
|
||||
stat("/", &st); // If this fails, we have bigger problems.
|
||||
bbg.root_major=major(st.st_dev);
|
||||
bbg.root_minor=minor(st.st_dev);
|
||||
xstat("/", &st);
|
||||
bbg.root_major = major(st.st_dev);
|
||||
bbg.root_minor = minor(st.st_dev);
|
||||
strcpy(temp,"/sys/block");
|
||||
find_dev(temp);
|
||||
strcpy(temp,"/sys/class");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user