[osmium-tool] 35/97: Make "osmium" command work on Windows, too.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 83481e221f73a49f20a185067716749a1b92e6c0
Author: Jochen Topf <jochen at topf.org>
Date:   Wed Aug 27 20:09:27 2014 +0200

    Make "osmium" command work on Windows, too.
---
 src/main.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index f6a1580..8fc90e1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,8 +45,9 @@ int main(int argc, char *argv[]) {
     std::string command = argv[0];
 
     // remove path from command
-    if (command.find_last_of("/") != std::string::npos) {
-        command = command.substr(command.find_last_of("/") + 1);
+    // (backslash for windows, slash for everybody else)
+    if (command.find_last_of("/\\") != std::string::npos) {
+        command = command.substr(command.find_last_of("/\\") + 1);
     }
 
     std::vector<std::string> arguments;
@@ -55,7 +56,7 @@ int main(int argc, char *argv[]) {
         arguments.push_back(argv[i]);
     }
 
-    if (command == "osmium") {
+    if (command == "osmium" || command == "osmium.exe") {
         if (arguments.size() == 0) {
             command = "help";
         } else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git