diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-10-06 12:50:22 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-10-06 12:50:22 +0100 |
| commit | b04d11dcbadda2620743a1dd923938f2f3043a38 (patch) | |
| tree | 971afe425a81304b79e44122e220c7a69efe2616 /util-linux | |
| parent | 124bbf02948b7ac0babb4ead04acd1559db182d3 (diff) | |
| parent | 760d035699c4a878f9109544c1d35ea0d5f6b76c (diff) | |
| download | busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.gz busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.tar.bz2 busybox-w32-b04d11dcbadda2620743a1dd923938f2f3043a38.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fatattr.c | 4 | ||||
| -rw-r--r-- | util-linux/mdev.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/fatattr.c b/util-linux/fatattr.c index 0f8d63268..5d933874a 100644 --- a/util-linux/fatattr.c +++ b/util-linux/fatattr.c | |||
| @@ -34,8 +34,8 @@ | |||
| 34 | #include "libbb.h" | 34 | #include "libbb.h" |
| 35 | /* linux/msdos_fs.h says: */ | 35 | /* linux/msdos_fs.h says: */ |
| 36 | #ifndef FAT_IOCTL_GET_ATTRIBUTES | 36 | #ifndef FAT_IOCTL_GET_ATTRIBUTES |
| 37 | # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) | 37 | # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, uint32_t) |
| 38 | # define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) | 38 | # define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, uint32_t) |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | /* Currently supports only the FAT flags, not the NTFS ones. | 41 | /* Currently supports only the FAT flags, not the NTFS ones. |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index e80b58f2e..b2d56575f 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
| @@ -972,7 +972,7 @@ wait_for_seqfile(const char *seq) | |||
| 972 | break; | 972 | break; |
| 973 | } | 973 | } |
| 974 | seqbuf[seqlen] = '\0'; | 974 | seqbuf[seqlen] = '\0'; |
| 975 | if (seqbuf[0] == '\n') { | 975 | if (seqbuf[0] == '\n' || seqbuf[0] == '\0') { |
| 976 | /* seed file: write out seq ASAP */ | 976 | /* seed file: write out seq ASAP */ |
| 977 | xwrite_str(seq_fd, seq); | 977 | xwrite_str(seq_fd, seq); |
| 978 | xlseek(seq_fd, 0, SEEK_SET); | 978 | xlseek(seq_fd, 0, SEEK_SET); |