From 67a665a2e46684d755c84ab41e3b2372b6cafec2 Mon Sep 17 00:00:00 2001 From: Thomas Ingram Date: Sun, 30 Jun 2019 23:51:53 -0400 Subject: [PATCH 1/2] Fixed markdown headings in changelog --- CHANGELOG.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18613fb..45030d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ -####Version history: -######0.6.1 +#### Version history: +###### 0.6.1 - Color coding fixed * Thanks to Hagb @ Github -######0.6.0 +###### 0.6.0 - Version numbering changed to more sane system (0.0.5 -> 0.6.0) - Fixed munged output - Support for using environment variables to set some basic options @@ -14,7 +14,7 @@ - Man page added - Proper makefile added -######0.0.5 +###### 0.0.5 - IPv6 support! * Thanks to 'Tanja84dk' for addressing the real need of IPv6. @@ -34,20 +34,20 @@ - Client now tries to clean the incoming socket data if last package was out of spec. -######0.0.4 +###### 0.0.4 - Reverted back to default getopts options error handler (opterr = 1). Custom error handler requires rewriting. - Some cosmetic changes in program output strings. - Program usage(); function now waits for enter before exiting on Windows. -######0.0.3 +###### 0.0.3 - Colors are now supported on Windows too! - Terminal mode is now triggered with "-t" flag. "-i" flag still works for backwards compatibility. - Bug fixes (Packet size check always evaluating false and color validity check always evaluating true). -######0.0.2 +###### 0.0.2 - License changed from 'ISC License' to 'zlib/libpng License'. - Bug fixes & code cleanups - Interactive mode (-i flag). Client acts as interactive terminal. @@ -55,14 +55,14 @@ If connecting or authentication fails, the return value is -1. - Colors are now enabled by default. Now '-c' flag disables the color support. -######0.0.1 +###### 0.0.1 - Added experimental support for bukkit colors. Should work with any sh compatible shell. - Packet string data limited to max 2048 (DATA_BUFFSIZE) bytes. No idea how Minecraft handles multiple rcon packets. If someone knows, please mail me so I can implement it. -####TODO: +#### TODO: - Make the receive buffer dynamic?? - Change some of the packet size issues to fatal errors. - Code cleanups. From 872ddccbfc0aad5f85680a829b96db9db2595971 Mon Sep 17 00:00:00 2001 From: Thomas Ingram Date: Mon, 1 Jul 2019 00:03:41 -0400 Subject: [PATCH 2/2] Set default address to localhost --- CHANGELOG.md | 4 ++++ mcrcon.1 | 2 +- mcrcon.c | 13 +++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45030d8..32aed56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ #### Version history: + +###### 0.6.2 + - Set default address to localhost + ###### 0.6.1 - Color coding fixed * Thanks to Hagb @ Github diff --git a/mcrcon.1 b/mcrcon.1 index 51ee6ba..4f9b26c 100644 --- a/mcrcon.1 +++ b/mcrcon.1 @@ -17,7 +17,7 @@ It is well suited for remote administration and server maintenance scripts. .IP -h Print usage .IP -H -Server address +Server address (default is localhost) .IP -P Port (default is 25575) .IP -p diff --git a/mcrcon.c b/mcrcon.c index 1d94ddd..62cd976 100644 --- a/mcrcon.c +++ b/mcrcon.c @@ -147,7 +147,10 @@ int main(int argc, char *argv[]) if (!port) port = "25575"; - if(argc < 2 && host == NULL && pass == NULL) + if (!host) + host = "localhost"; + + if(argc < 1 && pass == NULL) usage(); // default getopt error handler enabled @@ -185,12 +188,6 @@ int main(int argc, char *argv[]) } } - if (host == NULL) - { - fputs("Host not defined (-H flag). Try 'mcrcon -h' or 'man mcrcon' for more information.\n\n", stdout); - return 0; - } - if (pass == NULL) { fputs("Password not defined (-p flag). Try 'mcrcon -h' 'man mcrcon' for more information.\n\n", stdout); @@ -240,7 +237,7 @@ void usage(void) "Sends rcon commands to Minecraft server.\n\n" "Option:\n" " -h\t\tPrint usage\n" - " -H\t\tServer address\n" + " -H\t\tServer address (default is localhost)\n" " -P\t\tPort (default is 25575)\n" " -p\t\tRcon password\n" " -t\t\tInteractive terminal mode\n"