BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Prettify --help output

Browse Source
This commit is contained in:
Perttu Ahola 2012-03-11 11:02:22 +02:00
parent 37b2bc3c0c
commit d330430336
3 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.cpp
View File

@ -68,6 +68,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "profiler.h"
#include "log.h"
#include "mods.h"
#include "utility_string.h"
/*
Settings.
@ -798,21 +799,17 @@ int main(int argc, char *argv[])
i = allowed_options.getIterator();
i.atEnd() == false; i++)
{
dstream<<" --"<<i.getNode()->getKey();
std::ostringstream os1(std::ios::binary);
os1<<" --"<<i.getNode()->getKey();
if(i.getNode()->getValue().type == VALUETYPE_FLAG)
{
}
{}
else
{
dstream<<" <value>";
}
dstream<<std::endl;
os1<<" <value>";
dstream<<padStringRight(os1.str(), 24);
if(i.getNode()->getValue().help != NULL)
{
dstream<<" "<<i.getNode()->getValue().help
<<std::endl;
}
dstream<<i.getNode()->getValue().help;
dstream<<std::endl;
}
return cmd_args.getFlag("help") ? 0 : 1;

8
src/server.cpp
View File

@ -48,6 +48,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "sha1.h"
#include "base64.h"
#include "tool.h"
#include "utility_string.h"
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
@ -824,13 +825,6 @@ void PlayerInfo::PrintLine(std::ostream *s)
(*s)<<std::endl;
}
static std::string padStringRight(std::string s, size_t len)
{
if(len > s.size())
s.insert(s.end(), len - s.size(), ' ');
return s;
}
/*
Server
*/

35
src/utility_string.h Normal file
View File

@ -0,0 +1,35 @@
/*
Minetest-c55
Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef UTILITY_STRING_HEADER
#define UTILITY_STRING_HEADER
// Note: Some stuff could be moved to here from utility.h
#include <string>
static inline std::string padStringRight(std::string s, size_t len)
{
if(len > s.size())
s.insert(s.end(), len - s.size(), ' ');
return s;
}
#endif