Revert "Update external/gptfdisk to 1.0.1"
This reverts commit 74b7490a22bb9ad5f521a62b9c9100e70b94da9b.
This change caused a regression in fugu usb formatting.
Bug: 35217931
Test: None
Change-Id: I50c73bde912a7c941e1d67d41bfab02042db88eb
diff --git a/diskio-unix.cc b/diskio-unix.cc
index 75fad2e..fb463f9 100644
--- a/diskio-unix.cc
+++ b/diskio-unix.cc
@@ -76,8 +76,7 @@
if (fstat64(fd, &st) == 0) {
if (S_ISDIR(st.st_mode))
cerr << "The specified path is a directory!\n";
-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) \
- && !defined(__APPLE__)
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
else if (S_ISCHR(st.st_mode))
cerr << "The specified path is a character device!\n";
#endif
@@ -256,8 +255,7 @@
i = ioctl(fd, BLKRRPART);
if (i) {
cout << "Warning: The kernel is still using the old partition table.\n"
- << "The new table will be used at the next reboot or after you\n"
- << "run partprobe(8) or kpartx(8)\n";
+ << "The new table will be used at the next reboot.\n";
} else {
retval = 1;
} // if/else
@@ -275,7 +273,7 @@
// Note that seeking beyond the end of the file is NOT detected as a failure!
int DiskIO::Seek(uint64_t sector) {
int retval = 1;
- off_t seekTo, sought;
+ off64_t seekTo, sought;
// If disk isn't open, try to open it....
if (!isOpen) {