diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-12-21 15:07:30 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-12-21 15:07:30 +0000 |
| commit | 17329745fc31fb23e6647ddf4ed41c0a8a0f90c1 (patch) | |
| tree | 4d16956dc28232307002029d86e557736ebd4eac | |
| parent | 5d84c2398efe3df87141b647228f8817aad12ab6 (diff) | |
| download | busybox-w32-17329745fc31fb23e6647ddf4ed41c0a8a0f90c1.tar.gz busybox-w32-17329745fc31fb23e6647ddf4ed41c0a8a0f90c1.tar.bz2 busybox-w32-17329745fc31fb23e6647ddf4ed41c0a8a0f90c1.zip | |
- fix check for group and user, remove some whitespace while at it.
| -rw-r--r-- | miscutils/makedevs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 7bfe54fc1..0268fbb9d 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
| @@ -86,7 +86,7 @@ extern int makedevs_main(int argc, char **argv) | |||
| 86 | int ret = EXIT_SUCCESS; | 86 | int ret = EXIT_SUCCESS; |
| 87 | 87 | ||
| 88 | unsigned long flags; | 88 | unsigned long flags; |
| 89 | flags = bb_getopt_ulflags(argc, argv, "d:", &line); | 89 | flags = bb_getopt_ulflags(argc, argv, "d:", &line); |
| 90 | if (line) | 90 | if (line) |
| 91 | table = bb_xfopen(line, "r"); | 91 | table = bb_xfopen(line, "r"); |
| 92 | 92 | ||
| @@ -138,9 +138,9 @@ extern int makedevs_main(int argc, char **argv) | |||
| 138 | if (name[0] == '#') { | 138 | if (name[0] == '#') { |
| 139 | continue; | 139 | continue; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | gid = group ? get_ug_id(group, bb_xgetgrnam) : getgid(); | 142 | gid = (*group) ? get_ug_id(group, bb_xgetgrnam) : getgid(); |
| 143 | uid = user ? get_ug_id(user, bb_xgetpwnam) : getuid(); | 143 | uid = (*user) ? get_ug_id(user, bb_xgetpwnam) : getuid(); |
| 144 | full_name = concat_path_file(rootdir, name); | 144 | full_name = concat_path_file(rootdir, name); |
| 145 | 145 | ||
| 146 | if (type == 'd') { | 146 | if (type == 'd') { |