Fixed bug that caused spurious "1" exit condition in gdisk. Also
modified Windows warning text in light of common use of GPT on Windows 8 and 8.1.
This commit is contained in:
7
gdisk.cc
7
gdisk.cc
@@ -15,6 +15,7 @@ int main(int argc, char* argv[]) {
|
||||
GPTDataTextUI theGPT;
|
||||
string device = "";
|
||||
UnicodeString uString;
|
||||
int isError = 0;
|
||||
|
||||
#ifndef EFI
|
||||
cout << "GPT fdisk (gdisk) version " << GPTFDISK_VERSION << "\n\n";
|
||||
@@ -49,16 +50,20 @@ int main(int argc, char* argv[]) {
|
||||
device = (string) argv[1];
|
||||
} else { // 3 arguments, but none is "-l"
|
||||
cerr << "Usage: " << argv[0] << " [-l] device_file\n";
|
||||
isError = 1;
|
||||
} // if/elseif/else
|
||||
if (device != "") {
|
||||
theGPT.JustLooking();
|
||||
if (theGPT.LoadPartitions(device))
|
||||
theGPT.DisplayGPTData();
|
||||
else
|
||||
isError = 1;
|
||||
} // if
|
||||
break;
|
||||
default:
|
||||
cerr << "Usage: " << argv[0] << " [-l] device_file\n";
|
||||
isError = 1;
|
||||
break;
|
||||
} // switch
|
||||
return 1 ;
|
||||
return (isError);
|
||||
} // main
|
||||
|
||||
10
support.cc
10
support.cc
@@ -328,11 +328,11 @@ void ReverseBytes(void* theValue, int numBytes) {
|
||||
void WinWarning(void) {
|
||||
#ifdef _WIN32
|
||||
cout << "\a************************************************************************\n"
|
||||
<< "Most versions of Windows cannot boot from a GPT disk, and most varieties\n"
|
||||
<< "prior to Vista cannot read GPT disks. Therefore, you should exit now\n"
|
||||
<< "unless you understand the implications of converting MBR to GPT or creating\n"
|
||||
<< "a new GPT disk layout!\n"
|
||||
<< "************************************************************************\n\n";
|
||||
<< "Most versions of Windows cannot boot from a GPT disk except on a UEFI-based\n"
|
||||
<< "computer, and most varieties prior to Vista cannot read GPT disks. Therefore,\n"
|
||||
<< "you should exit now unless you understand the implications of converting MBR\n"
|
||||
<< "to GPT or creating a new GPT disk layout!\n"
|
||||
<< "************************************************************************\n\n";
|
||||
cout << "Are you SURE you want to continue? ";
|
||||
if (GetYN() != 'Y')
|
||||
exit(0);
|
||||
|
||||
Reference in New Issue
Block a user