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

cleanup style ... just because you use less spaces doesnt mean the resulting code is smaller

Browse Source
This commit is contained in:
Mike Frysinger 2006-02-03 00:25:37 +00:00
parent 248d2220f9
commit a421ba8203
1 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
util-linux/mdev.c
View File

@ -23,19 +23,20 @@
#include "xregex.h" #include "xregex.h"
#define DEV_PATH "/dev" #define DEV_PATH "/dev"
#define MDEV_CONF "/etc/mdev.conf"
#include <busybox.h> #include <busybox.h>
/* mknod in /dev based on a path like "/sys/block/hda/hda1" */ /* mknod in /dev based on a path like "/sys/block/hda/hda1" */
static void make_device(char *path) static void make_device(char *path)
{ {
char *device_name,*s; char *device_name, *s;
int major,minor,type,len,fd; int major, minor, type, len, fd;
int mode=0660; int mode = 0660;
uid_t uid=0; uid_t uid = 0;
gid_t gid=0; gid_t gid = 0;
RESERVE_CONFIG_BUFFER(temp,PATH_MAX); RESERVE_CONFIG_BUFFER(temp, PATH_MAX);
/* Try to read major/minor string */ /* Try to read major/minor string */
@ -43,59 +44,63 @@ static void make_device(char *path)
fd = open(temp, O_RDONLY); fd = open(temp, O_RDONLY);
len = read(fd, temp, PATH_MAX-1); len = read(fd, temp, PATH_MAX-1);
close(fd); close(fd);
if (len<1) goto end; if (len < 1) goto end;
/* Determine device name, type, major and minor */ /* Determine device name, type, major and minor */
device_name = strrchr(path, '/') + 1; device_name = strrchr(path, '/') + 1;
type = strncmp(path+5, "block/" ,6) ? S_IFCHR : S_IFBLK; type = strncmp(path+5, "block/", 6) ? S_IFCHR : S_IFBLK;
if(sscanf(temp, "%d:%d", &major, &minor) != 2) goto end; if (sscanf(temp, "%d:%d", &major, &minor) != 2)
goto end;
/* If we have a config file, look up permissions for this device */ /* If we have a config file, look up permissions for this device */
if (ENABLE_FEATURE_MDEV_CONF) { if (ENABLE_FEATURE_MDEV_CONF) {
char *conf,*pos,*end; char *conf, *pos, *end;
/* mmap the config file */ /* mmap the config file */
if (-1!=(fd=open("/etc/mdev.conf",O_RDONLY))) { if (-1 != (fd=open(MDEV_CONF,O_RDONLY))) {
len=lseek(fd,0,SEEK_END); len = lseek(fd, 0, SEEK_END);
conf=mmap(NULL,len,PROT_READ,MAP_PRIVATE,fd,0); conf = mmap(NULL, len, PROT_READ, MAP_PRIVATE, fd, 0);
if (conf) { if (conf) {
int line=0; int line = 0;
/* Loop through lines in mmaped file*/ /* Loop through lines in mmaped file*/
for (pos=conf;pos-conf<len;) { for (pos=conf; pos-conf<len;) {
int field; int field;
char *end2; char *end2;
line++; line++;
/* find end of this line */ /* find end of this line */
for(end=pos;end-conf<len && *end!='\n';end++); for(end=pos; end-conf<len && *end!='\n'; end++)
;
/* Three fields: regex, uid:gid, mode */ /* Three fields: regex, uid:gid, mode */
for (field=3;field;field--) { for (field=3; field; field--) {
/* Skip whitespace */ /* Skip whitespace */
while (pos<end && isspace(*pos)) pos++; while (pos<end && isspace(*pos))
if (pos==end || *pos=='#') break; pos++;
for (end2=pos; if (pos==end || *pos=='#')
end2<end && !isspace(*end2) && *end2!='#'; end2++); break;
switch(field) { for (end2=pos; end2<end && !isspace(*end2) && *end2!='#'; end2++)
;
switch (field) {
/* Regex to match this device */ /* Regex to match this device */
case 3: case 3:
{ {
char *regex=strndupa(pos,end2-pos); char *regex = strndupa(pos,end2-pos);
regex_t match; regex_t match;
regmatch_t off; regmatch_t off;
int result; int result;
/* Is this it? */ /* Is this it? */
xregcomp(&match,regex,REG_EXTENDED); xregcomp(&match,regex,REG_EXTENDED);
result=regexec(&match,device_name,1,&off,0); result = regexec(&match,device_name,1,&off,0);
regfree(&match); regfree(&match);
/* If not this device, skip rest of line */ /* If not this device, skip rest of line */
if(result || off.rm_so if (result || off.rm_so || off.rm_eo!=strlen(device_name))
|| off.rm_eo!=strlen(device_name))
goto end_line; goto end_line;
break; break;
@ -106,37 +111,43 @@ static void make_device(char *path)
char *s2; char *s2;
/* Find : */ /* Find : */
for(s=pos;s<end2 && *s!=':';s++); for(s=pos; s<end2 && *s!=':'; s++)
if(s==end2) goto end_line; ;
if (s == end2)
goto end_line;
/* Parse UID */ /* Parse UID */
uid=strtoul(pos,&s2,10); uid = strtoul(pos,&s2,10);
if(s!=s2) { if (s != s2) {
struct passwd *pass; struct passwd *pass;
pass=getpwnam(strndupa(pos,s-pos)); pass = getpwnam(strndupa(pos,s-pos));
if(!pass) goto end_line; if (!pass)
uid=pass->pw_uid; goto end_line;
uid = pass->pw_uid;
} }
s++; s++;
/* parse GID */ /* parse GID */
gid=strtoul(s,&s2,10); gid = strtoul(s,&s2,10);
if(end2!=s2) { if (end2 != s2) {
struct group *grp; struct group *grp;
grp=getgrnam(strndupa(s,end2-s)); grp = getgrnam(strndupa(s,end2-s));
if(!grp) goto end_line; if (!grp)
gid=grp->gr_gid; goto end_line;
gid = grp->gr_gid;
} }
break; break;
} }
/* mode */ /* mode */
case 1: case 1:
{ {
mode=strtoul(pos,&pos,8); mode = strtoul(pos,&pos,8);
if(pos!=end2) goto end_line; if (pos != end2)
goto end_line;
else
goto found_device; goto found_device;
} }
} }
pos=end2; pos = end2;
} }
end_line: end_line:
/* Did everything parse happily? */ /* Did everything parse happily? */
@ -144,10 +155,10 @@ end_line:
bb_error_msg_and_die("Bad line %d",line); bb_error_msg_and_die("Bad line %d",line);
/* Next line */ /* Next line */
pos=++end; pos = ++end;
} }
found_device: found_device:
munmap(conf,len); munmap(conf, len);
} }
close(fd); close(fd);
} }
@ -170,7 +181,7 @@ end:
static void find_dev(char *path) static void find_dev(char *path)
{ {
DIR *dir; DIR *dir;
size_t len=strlen(path); size_t len = strlen(path);
struct dirent *entry; struct dirent *entry;
if ((dir = opendir(path)) == NULL) if ((dir = opendir(path)) == NULL)
@ -180,7 +191,8 @@ static void find_dev(char *path)
/* Skip "." and ".." (also skips hidden files, which is ok) */ /* Skip "." and ".." (also skips hidden files, which is ok) */
if (entry->d_name[0]=='.') continue; if (entry->d_name[0] == '.')
continue;
if (entry->d_type == DT_DIR) { if (entry->d_type == DT_DIR) {
snprintf(path+len, PATH_MAX-len, "/%s", entry->d_name); snprintf(path+len, PATH_MAX-len, "/%s", entry->d_name);
@ -214,7 +226,8 @@ int mdev_main(int argc, char *argv[])
} else { } else {
action = getenv("ACTION"); action = getenv("ACTION");
env_path = getenv("DEVPATH"); env_path = getenv("DEVPATH");
if (!action || !env_path) bb_show_usage(); if (!action || !env_path)
bb_show_usage();
if (!strcmp(action, "add")) { if (!strcmp(action, "add")) {
sprintf(temp, "/sys%s", env_path); sprintf(temp, "/sys%s", env_path);
@ -225,6 +238,6 @@ int mdev_main(int argc, char *argv[])
} }
} }
if(ENABLE_FEATURE_CLEAN_UP) RELEASE_CONFIG_BUFFER(temp); if (ENABLE_FEATURE_CLEAN_UP) RELEASE_CONFIG_BUFFER(temp);
return 0; return 0;
} }