diff options
author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-01-21 11:20:01 +0000 |
---|---|---|
committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2007-01-21 11:20:01 +0000 |
commit | 4560925d661ff975245f33b210e80d56d765733a (patch) | |
tree | 811fa15080bb322ebbd4c7be37605a3abbcdf1c7 | |
parent | bb21944ea0d5e95f07691dfaeaba404ddfa70528 (diff) | |
download | busybox-w32-4560925d661ff975245f33b210e80d56d765733a.tar.gz busybox-w32-4560925d661ff975245f33b210e80d56d765733a.tar.bz2 busybox-w32-4560925d661ff975245f33b210e80d56d765733a.zip |
- use makedev to get device number, else it gives wrong major/minor numbers to devices files on systems which use big device numbers.
Closes #919
git-svn-id: svn://busybox.net/trunk/busybox@17430 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | miscutils/makedevs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index c25bdadc4..5602c2248 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
@@ -185,7 +185,7 @@ int makedevs_main(int argc, char **argv) | |||
185 | full_name_inc = xmalloc(strlen(full_name) + 4); | 185 | full_name_inc = xmalloc(strlen(full_name) + 4); |
186 | for (i = start; i < count; i++) { | 186 | for (i = start; i < count; i++) { |
187 | sprintf(full_name_inc, "%s%d", full_name, i); | 187 | sprintf(full_name_inc, "%s%d", full_name, i); |
188 | rdev = (major << 8) + minor + (i * increment - start); | 188 | rdev = makedev(major, minor + (i * increment - start)); |
189 | if (mknod(full_name_inc, mode, rdev) == -1) { | 189 | if (mknod(full_name_inc, mode, rdev) == -1) { |
190 | bb_perror_msg("line %d: cannot create node %s", linenum, full_name_inc); | 190 | bb_perror_msg("line %d: cannot create node %s", linenum, full_name_inc); |
191 | ret = EXIT_FAILURE; | 191 | ret = EXIT_FAILURE; |
@@ -201,7 +201,7 @@ int makedevs_main(int argc, char **argv) | |||
201 | } | 201 | } |
202 | free(full_name_inc); | 202 | free(full_name_inc); |
203 | } else { | 203 | } else { |
204 | rdev = (major << 8) + minor; | 204 | rdev = makedev(major, minor); |
205 | if (mknod(full_name, mode, rdev) == -1) { | 205 | if (mknod(full_name, mode, rdev) == -1) { |
206 | bb_perror_msg("line %d: cannot create node %s", linenum, full_name); | 206 | bb_perror_msg("line %d: cannot create node %s", linenum, full_name); |
207 | ret = EXIT_FAILURE; | 207 | ret = EXIT_FAILURE; |