diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2011-03-17 16:21:09 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2011-03-17 16:21:09 +0000 |
| commit | 6e84b9879a8ffc3651ec5eef2553daf9979b2b8f (patch) | |
| tree | 5fc107db6af8b8809ae758747ce5e73097ca334a /sysutils/ntfsprogs/files/patch-ntfsprogs-mkntfs.c | |
| parent | - Correct latest entry (diff) | |
Fix mkntfs
Replace Vista's $UpCase file by a Windows XP one
Pass maintainership to submitter
Remove md5 sum while I'm here
PR: ports/144852
Submitted by: Samuel Martin Moro <faust64 at gmail.com>
Diffstat (limited to 'sysutils/ntfsprogs/files/patch-ntfsprogs-mkntfs.c')
| -rw-r--r-- | sysutils/ntfsprogs/files/patch-ntfsprogs-mkntfs.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/sysutils/ntfsprogs/files/patch-ntfsprogs-mkntfs.c b/sysutils/ntfsprogs/files/patch-ntfsprogs-mkntfs.c new file mode 100644 index 000000000000..fc9c2c2935c4 --- /dev/null +++ b/sysutils/ntfsprogs/files/patch-ntfsprogs-mkntfs.c @@ -0,0 +1,31 @@ +--- ntfsprogs/mkntfs.c 2007-09-19 18:51:09.000000000 +0200 ++++ ntfsprogs/mkntfs.c 2010-03-16 17:26:42.000000000 +0100 +@@ -552,12 +552,16 @@ + total = 0LL; + retry = 0; + do { +- bytes_written = dev->d_ops->write(dev, b, count); ++ bytes_written = (long long)dev->d_ops->write(dev, b, count); + if (bytes_written == -1LL) { + retry = errno; + ntfs_log_perror("Error writing to %s", dev->d_name); + errno = retry; + return bytes_written; ++ } else if (bytes_written < 0) { ++ errno = EINVAL; ++ ntfs_log_error("Failed to write to device %s.\n", dev->d_name); ++ return -1; + } else if (!bytes_written) { + retry++; + } else { +@@ -3072,8 +3076,8 @@ + goto done; + } + +- if (!S_ISBLK(sbuf.st_mode)) { +- ntfs_log_error("%s is not a block device.\n", vol->dev->d_name); ++ if (!S_ISCHR(sbuf.st_mode)) { ++ ntfs_log_error("%s is not a character device.\n", vol->dev->d_name); + if (!opts.force) { + ntfs_log_error("Refusing to make a filesystem here!\n"); + goto done; |