diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /miscutils/makedevs.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'miscutils/makedevs.c')
| -rw-r--r-- | miscutils/makedevs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index bba7fa61d..e74c47c35 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
| @@ -121,7 +121,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv) | |||
| 121 | 121 | ||
| 122 | if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", | 122 | if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", |
| 123 | name, &type, &mode, user, group, | 123 | name, &type, &mode, user, group, |
| 124 | &major, &minor, &start, &increment, &count)) | 124 | &major, &minor, &start, &increment, &count)) |
| 125 | || ((unsigned)(major | minor | start | count | increment) > 255) | 125 | || ((unsigned)(major | minor | start | count | increment) > 255) |
| 126 | ) { | 126 | ) { |
| 127 | bb_error_msg("invalid line %d: '%s'", linenum, line); | 127 | bb_error_msg("invalid line %d: '%s'", linenum, line); |