summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/Server.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2005-01-13 07:45:15 +0000
committerMichi Henning <michi@zeroc.com>2005-01-13 07:45:15 +0000
commit8bad22ff021f5865cac5b7b98627cc0f851de267 (patch)
tree753f71c6e8a0dd19aec1babe95166293cb51f044 /cpp/src/IcePatch2/Server.cpp
parentFixed typo in UNIX-specific part of code. (diff)
downloadice-8bad22ff021f5865cac5b7b98627cc0f851de267.tar.bz2
ice-8bad22ff021f5865cac5b7b98627cc0f851de267.tar.xz
ice-8bad22ff021f5865cac5b7b98627cc0f851de267.zip
Added UNIX-specific part for Logger::print() operation. Fixed bug in
UNIX-specific code of icepatch2server. Removed check to see whether --nochdir is used only when --daemon is set in Ice::Service, so we can force --nochdir for icepatch2server.
Diffstat (limited to 'cpp/src/IcePatch2/Server.cpp')
-rw-r--r--cpp/src/IcePatch2/Server.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index a06d8b1889e..0b02416a7a0 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -238,7 +238,7 @@ IcePatch2::PatcherService::usage(const string& appName)
"\n"
"\n"
"--daemon Run as a daemon.\n"
- "--noclose Do not close open file descriptors.\n"
+ "--noclose Do not close open file descriptors."
// --nochdir is intentionally not shown here. (See the comment in main().)
);
@@ -283,8 +283,9 @@ main(int argc, char* argv[])
try
{
- status = svc.main(argc + 1, v);
- u
+ int ac = argc + 1;
+ status = svc.main(ac, v);
+ }
catch(...)
{
// Ignore exceptions -- the only thing left to do is to free memory.