2
0
Эх сурвалжийг харах

from_os_specific command line

David Rose 24 жил өмнө
parent
commit
4d83268ede

+ 3 - 3
pandatool/src/progbase/programBase.cxx

@@ -144,7 +144,7 @@ void ProgramBase::
 show_usage() {
 show_usage() {
   nout << "\rUsage:\n";
   nout << "\rUsage:\n";
   Runlines::const_iterator ri;
   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) {
   for (ri = _runlines.begin(); ri != _runlines.end(); ++ri) {
     show_text(prog, prog.length() + 1, *ri);
     show_text(prog, prog.length() + 1, *ri);
@@ -203,7 +203,7 @@ show_text(const string &prefix, int indent_width, string text) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void ProgramBase::
 void ProgramBase::
 parse_command_line(int argc, char *argv[]) {
 parse_command_line(int argc, char *argv[]) {
-  _program_name = argv[0];
+  _program_name = Filename::from_os_specific(argv[0]);
   int i;
   int i;
   for (i = 1; i < argc; i++) {
   for (i = 1; i < argc; i++) {
     _program_args.push_back(argv[i]);
     _program_args.push_back(argv[i]);
@@ -355,7 +355,7 @@ string ProgramBase::
 get_exec_command() const {
 get_exec_command() const {
   string command;
   string command;
 
 
-  command = _program_name;
+  command = _program_name.get_basename_wo_extension();
   Args::const_iterator ai;
   Args::const_iterator ai;
   for (ai = _program_args.begin(); ai != _program_args.end(); ++ai) {
   for (ai = _program_args.begin(); ai != _program_args.end(); ++ai) {
     const string &arg = (*ai);
     const string &arg = (*ai);