[Spice-devel] [PATCH 2/8] client: Don't use basename for argv[0] in --help output

alexl at redhat.com alexl at redhat.com
Wed Sep 29 04:43:04 PDT 2010


From: Alexander Larsson <alexl at redhat.com>

This isn't what other apps do, and it had issues in the OSX port,
so just remove this.
---
 client/cmd_line_parser.cpp |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/client/cmd_line_parser.cpp b/client/cmd_line_parser.cpp
index ef72dba..3f45551 100644
--- a/client/cmd_line_parser.cpp
+++ b/client/cmd_line_parser.cpp
@@ -428,29 +428,13 @@ char* CmdLineParser::next_argument()
     return _argv[optind++];
 }
 
-#ifdef WIN32
-char* basename(char *str)
-{
-    char *base;
-    if ((base = strrchr(str, '\\'))) {
-        return base;
-    }
-
-    if ((base = strrchr(str, ':'))) {
-        return base;
-    }
-    return str;
-}
-
-#endif
-
 void CmdLineParser::show_help()
 {
     static const int HELP_START_POS = 30;
     static const int HELP_WIDTH = 80 - HELP_START_POS;
     std::ostringstream os;
 
-    os << basename(_argv[0]) << " - " << _description.c_str() << "\n\noptions:\n\n";
+    os << _argv[0] << " - " << _description.c_str() << "\n\noptions:\n\n";
 
     Options::iterator iter = _options.begin();
     for (; iter != _options.end(); ++iter) {
-- 
1.7.0.1



More information about the Spice-devel mailing list