summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/Client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IcePatch2/Client.cpp')
-rw-r--r--cpp/src/IcePatch2/Client.cpp264
1 files changed, 132 insertions, 132 deletions
diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 50cbbd474b1..5bdbf0c0e10 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -28,137 +28,137 @@ class TextPatcherFeedback : public PatcherFeedback
public:
TextPatcherFeedback() :
- _pressAnyKeyMessage(false)
+ _pressAnyKeyMessage(false)
{
#ifndef _WIN32
- tcgetattr(0, &_savedTerm);
- _savedFlags = fcntl(0, F_GETFL);
- _block = true;
+ tcgetattr(0, &_savedTerm);
+ _savedFlags = fcntl(0, F_GETFL);
+ _block = true;
#endif
}
virtual ~TextPatcherFeedback()
{
#ifndef _WIN32
- tcsetattr(0, TCSANOW, &_savedTerm);
- fcntl(0, F_SETFL, _savedFlags);
+ tcsetattr(0, TCSANOW, &_savedTerm);
+ fcntl(0, F_SETFL, _savedFlags);
#endif
}
virtual bool
noFileSummary(const string& reason)
{
- cout << "Cannot load file summary:\n" << reason << endl;
- string answer;
- do
- {
- cout << "Do a thorough patch? (yes/no)" << endl;
- cin >> answer;
- transform(answer.begin(), answer.end(), answer.begin(), ::tolower);
- if(answer == "no")
- {
- return false;
- }
- }
- while(answer != "yes");
- return true;
+ cout << "Cannot load file summary:\n" << reason << endl;
+ string answer;
+ do
+ {
+ cout << "Do a thorough patch? (yes/no)" << endl;
+ cin >> answer;
+ transform(answer.begin(), answer.end(), answer.begin(), ::tolower);
+ if(answer == "no")
+ {
+ return false;
+ }
+ }
+ while(answer != "yes");
+ return true;
}
virtual bool
checksumStart()
{
- if(!_pressAnyKeyMessage)
- {
- cout << "[Press any key to abort]" << endl;
- _pressAnyKeyMessage = true;
- }
+ if(!_pressAnyKeyMessage)
+ {
+ cout << "[Press any key to abort]" << endl;
+ _pressAnyKeyMessage = true;
+ }
- return !keyPressed();
+ return !keyPressed();
}
virtual bool
checksumProgress(const string& path)
{
- cout << "Calculating checksum for " << getBasename(path) << endl;
- return !keyPressed();
+ cout << "Calculating checksum for " << getBasename(path) << endl;
+ return !keyPressed();
}
virtual bool
checksumEnd()
{
- return !keyPressed();
+ return !keyPressed();
}
virtual bool
fileListStart()
{
- if(!_pressAnyKeyMessage)
- {
- cout << "[Press any key to abort]" << endl;
- _pressAnyKeyMessage = true;
- }
-
- _lastProgress = "0%";
- cout << "Getting list of files to patch: " << _lastProgress << flush;
- return !keyPressed();
+ if(!_pressAnyKeyMessage)
+ {
+ cout << "[Press any key to abort]" << endl;
+ _pressAnyKeyMessage = true;
+ }
+
+ _lastProgress = "0%";
+ cout << "Getting list of files to patch: " << _lastProgress << flush;
+ return !keyPressed();
}
virtual bool
fileListProgress(Int percent)
{
- for(unsigned int i = 0; i < _lastProgress.size(); ++i)
- {
- cout << '\b';
- }
- ostringstream s;
- s << percent << '%';
- _lastProgress = s.str();
- cout << _lastProgress << flush;
- return !keyPressed();
+ for(unsigned int i = 0; i < _lastProgress.size(); ++i)
+ {
+ cout << '\b';
+ }
+ ostringstream s;
+ s << percent << '%';
+ _lastProgress = s.str();
+ cout << _lastProgress << flush;
+ return !keyPressed();
}
virtual bool
fileListEnd()
{
- cout << endl;
- return !keyPressed();
+ cout << endl;
+ return !keyPressed();
}
virtual bool
patchStart(const string& path, Long size, Long totalProgress, Long totalSize)
{
- if(!_pressAnyKeyMessage)
- {
- cout << "[Press any key to abort]" << endl;
- _pressAnyKeyMessage = true;
- }
-
- ostringstream s;
- s << "0/" << size << " (" << totalProgress << '/' << totalSize << ')';
- _lastProgress = s.str();
- cout << getBasename(path) << ' ' << _lastProgress << flush;
- return !keyPressed();
+ if(!_pressAnyKeyMessage)
+ {
+ cout << "[Press any key to abort]" << endl;
+ _pressAnyKeyMessage = true;
+ }
+
+ ostringstream s;
+ s << "0/" << size << " (" << totalProgress << '/' << totalSize << ')';
+ _lastProgress = s.str();
+ cout << getBasename(path) << ' ' << _lastProgress << flush;
+ return !keyPressed();
}
virtual bool
patchProgress(Long progress, Long size, Long totalProgress, Long totalSize)
{
- for(unsigned int i = 0; i < _lastProgress.size(); ++i)
- {
- cout << '\b';
- }
- ostringstream s;
- s << progress << '/' << size << " (" << totalProgress << '/' << totalSize << ')';
- _lastProgress = s.str();
- cout << _lastProgress << flush;
- return !keyPressed();
+ for(unsigned int i = 0; i < _lastProgress.size(); ++i)
+ {
+ cout << '\b';
+ }
+ ostringstream s;
+ s << progress << '/' << size << " (" << totalProgress << '/' << totalSize << ')';
+ _lastProgress = s.str();
+ cout << _lastProgress << flush;
+ return !keyPressed();
}
virtual bool
patchEnd()
{
- cout << endl;
- return !keyPressed();
+ cout << endl;
+ return !keyPressed();
}
private:
@@ -168,17 +168,17 @@ private:
bool
keyPressed()
{
- bool pressed = false;
+ bool pressed = false;
#ifdef __BCPLUSPLUS__
- while(kbhit())
+ while(kbhit())
#else
- while(_kbhit())
+ while(_kbhit())
#endif
- {
- pressed = true;
- _getch();
- }
- return pressed;
+ {
+ pressed = true;
+ _getch();
+ }
+ return pressed;
}
#else
@@ -186,29 +186,29 @@ private:
bool
keyPressed()
{
- if(_block)
- {
- termios term;
- memcpy(&term, &_savedTerm, sizeof(termios));
- term.c_lflag &= ~(ECHO | ICANON);
- term.c_cc[VTIME] = 0;
- term.c_cc[VMIN] = 1;
- tcsetattr(0, TCSANOW, &term);
-
- int flags = _savedFlags;
- flags |= O_NONBLOCK;
- fcntl(0, F_SETFL, flags);
-
- _block = false;
- }
-
- bool pressed = false;
- char c;
- while(read(0, &c, 1) > 0)
- {
- pressed = true;
- }
- return pressed;
+ if(_block)
+ {
+ termios term;
+ memcpy(&term, &_savedTerm, sizeof(termios));
+ term.c_lflag &= ~(ECHO | ICANON);
+ term.c_cc[VTIME] = 0;
+ term.c_cc[VMIN] = 1;
+ tcsetattr(0, TCSANOW, &term);
+
+ int flags = _savedFlags;
+ flags |= O_NONBLOCK;
+ fcntl(0, F_SETFL, flags);
+
+ _block = false;
+ }
+
+ bool pressed = false;
+ char c;
+ while(read(0, &c, 1) > 0)
+ {
+ pressed = true;
+ }
+ return pressed;
}
termios _savedTerm;
@@ -245,59 +245,59 @@ Client::run(int argc, char* argv[])
vector<string> args;
try
{
- args = opts.parse(argc, (const char**)argv);
+ args = opts.parse(argc, (const char**)argv);
}
catch(const IceUtil::BadOptException& e)
{
cerr << e.reason << endl;
- usage(argv[0]);
- return EXIT_FAILURE;
+ usage(argv[0]);
+ return EXIT_FAILURE;
}
if(opts.isSet("help"))
{
- usage(argv[0]);
- return EXIT_SUCCESS;
+ usage(argv[0]);
+ return EXIT_SUCCESS;
}
if(opts.isSet("version"))
{
- cout << ICE_STRING_VERSION << endl;
- return EXIT_SUCCESS;
+ cout << ICE_STRING_VERSION << endl;
+ return EXIT_SUCCESS;
}
if(opts.isSet("thorough"))
{
- properties->setProperty("IcePatch2.Thorough", "1");
+ properties->setProperty("IcePatch2.Thorough", "1");
}
if(args.size() > 1)
{
- cerr << argv[0] << ": too many arguments" << endl;
- usage(argv[0]);
- return EXIT_FAILURE;
+ cerr << argv[0] << ": too many arguments" << endl;
+ usage(argv[0]);
+ return EXIT_FAILURE;
}
if(args.size() == 1)
{
- properties->setProperty("IcePatch2.Directory", simplify(args[0]));
+ properties->setProperty("IcePatch2.Directory", simplify(args[0]));
}
bool aborted = false;
try
{
- PatcherFeedbackPtr feedback = new TextPatcherFeedback;
- PatcherPtr patcher = new Patcher(communicator(), feedback);
+ PatcherFeedbackPtr feedback = new TextPatcherFeedback;
+ PatcherPtr patcher = new Patcher(communicator(), feedback);
- aborted = !patcher->prepare();
+ aborted = !patcher->prepare();
- if(!aborted)
- {
- aborted = !patcher->patch("");
- }
+ if(!aborted)
+ {
+ aborted = !patcher->patch("");
+ }
- if(!aborted)
- {
- patcher->finish();
- }
+ if(!aborted)
+ {
+ patcher->finish();
+ }
}
catch(const string& ex)
{
@@ -307,12 +307,12 @@ Client::run(int argc, char* argv[])
if(aborted)
{
- cout << "\n[Aborted]" << endl;
- return EXIT_FAILURE;
+ cout << "\n[Aborted]" << endl;
+ return EXIT_FAILURE;
}
else
{
- return EXIT_SUCCESS;
+ return EXIT_SUCCESS;
}
}
@@ -320,10 +320,10 @@ void
Client::usage(const string& appName)
{
string options =
- "Options:\n"
- "-h, --help Show this message.\n"
- "-v, --version Display the Ice version.\n"
- "-t, --thorough Recalculate all checksums.";
+ "Options:\n"
+ "-h, --help Show this message.\n"
+ "-v, --version Display the Ice version.\n"
+ "-t, --thorough Recalculate all checksums.";
cerr << "Usage: " << appName << " [options] [DIR]" << endl;
cerr << options << endl;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 12:44:37 +0000