From 4d83268ede9ba4890e30389bdbb2341ec14fbd88 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 12 Apr 2002 00:37:08 +0000 Subject: [PATCH] from_os_specific command line --- pandatool/src/progbase/programBase.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandatool/src/progbase/programBase.cxx b/pandatool/src/progbase/programBase.cxx index bdf8428a98..79d6bcd2b1 100644 --- a/pandatool/src/progbase/programBase.cxx +++ b/pandatool/src/progbase/programBase.cxx @@ -144,7 +144,7 @@ void ProgramBase:: show_usage() { nout << "\rUsage:\n"; Runlines::const_iterator ri; - string prog = " " +_program_name.get_basename(); + string prog = " " +_program_name.get_basename_wo_extension(); for (ri = _runlines.begin(); ri != _runlines.end(); ++ri) { show_text(prog, prog.length() + 1, *ri); @@ -203,7 +203,7 @@ show_text(const string &prefix, int indent_width, string text) { //////////////////////////////////////////////////////////////////// void ProgramBase:: parse_command_line(int argc, char *argv[]) { - _program_name = argv[0]; + _program_name = Filename::from_os_specific(argv[0]); int i; for (i = 1; i < argc; i++) { _program_args.push_back(argv[i]); @@ -355,7 +355,7 @@ string ProgramBase:: get_exec_command() const { string command; - command = _program_name; + command = _program_name.get_basename_wo_extension(); Args::const_iterator ai; for (ai = _program_args.begin(); ai != _program_args.end(); ++ai) { const string &arg = (*ai);