Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added svn:eol-style=native property.

Browse Source 
- Added missing newline at EOF (bugreport:7347)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17193 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2013-03-12 17:23:45 +00:00
parent b7d35015e1
commit 9e2bf9e2e2
10 changed files with 428 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
conf/msg_conf/char_msg.conf
View File

@ -1,129 +1,129 @@
// rAthena msg_athena.conf // rAthena msg_athena.conf
// Message Configuration of char-server // Message Configuration of char-server
// ----------------------- // -----------------------
0: Novice 0: Novice
1: Swordsman 1: Swordsman
2: Magician 2: Magician
3: Archer 3: Archer
4: Acolyte 4: Acolyte
5: Merchant 5: Merchant
6: Thief 6: Thief
7: Knight 7: Knight
8: Priest 8: Priest
9: Wizard 9: Wizard
10: Blacksmith 10: Blacksmith
11: Hunter 11: Hunter
12: Assassin 12: Assassin
13: Crusader 13: Crusader
14: Monk 14: Monk
15: Sage 15: Sage
16: Rogue 16: Rogue
17: Alchemist 17: Alchemist
18: Bard 18: Bard
19: Dancer 19: Dancer
20: Wedding 20: Wedding
21: Super Novice 21: Super Novice
22: Gunslinger 22: Gunslinger
23: Ninja 23: Ninja
24: Christmas 24: Christmas
25: High Novice 25: High Novice
26: High Swordsman 26: High Swordsman
27: High Magician 27: High Magician
28: High Archer 28: High Archer
29: High Acolyte 29: High Acolyte
30: High Merchant 30: High Merchant
31: High Thief 31: High Thief
32: Lord Knight 32: Lord Knight
33: High Priest 33: High Priest
34: High Wizard 34: High Wizard
35: Whitesmith 35: Whitesmith
//35: Mastersmith //IRO name //35: Mastersmith //IRO name
36: Sniper 36: Sniper
37: Assassin Cross 37: Assassin Cross
38: Paladin 38: Paladin
39: Champion 39: Champion
40: Professor 40: Professor
//40: Scholar //IRO name //40: Scholar //IRO name
41: Stalker 41: Stalker
42: Creator 42: Creator
//42: Biochemist //IRO Name //42: Biochemist //IRO Name
43: Clown 43: Clown
//43: Minstrel //IRO Name //43: Minstrel //IRO Name
44: Gypsy 44: Gypsy
45: Baby Novice 45: Baby Novice
46: Baby Swordsman 46: Baby Swordsman
47: Baby Magician 47: Baby Magician
48: Baby Archer 48: Baby Archer
49: Baby Acolyte 49: Baby Acolyte
50: Baby Merchant 50: Baby Merchant
51: Baby Thief 51: Baby Thief
52: Baby Knight 52: Baby Knight
53: Baby Priest 53: Baby Priest
54: Baby Wizard 54: Baby Wizard
55: Baby Blacksmith 55: Baby Blacksmith
56: Baby Hunter 56: Baby Hunter
57: Baby Assassin 57: Baby Assassin
58: Baby Crusader 58: Baby Crusader
59: Baby Monk 59: Baby Monk
60: Baby Sage 60: Baby Sage
61: Baby Rogue 61: Baby Rogue
62: Baby Alchemist 62: Baby Alchemist
63: Baby Bard 63: Baby Bard
64: Baby Dancer 64: Baby Dancer
65: Super Baby 65: Super Baby
66: Taekwon 66: Taekwon
67: Star Gladiator 67: Star Gladiator
68: Soul Linker 68: Soul Linker
//79: FREE //79: FREE
//70: FREE //70: FREE
71: Summer 71: Summer
72: Gangsi 72: Gangsi
73: Death Knight 73: Death Knight
74: Dark Collector 74: Dark Collector
75: Rune Knight 75: Rune Knight
76: Warlock 76: Warlock
77: Ranger 77: Ranger
78: Arch Bishop 78: Arch Bishop
79: Mechanic 79: Mechanic
80: Guillotine Cross 80: Guillotine Cross
81: Royal Guard 81: Royal Guard
82: Sorcerer 82: Sorcerer
83: Minstrel 83: Minstrel
//83: Maestro //IRO Name //83: Maestro //IRO Name
84: Wanderer 84: Wanderer
85: Sura 85: Sura
86: Genetic 86: Genetic
//86: Geneticist //IRO Name //86: Geneticist //IRO Name
87: Shadow Chaser 87: Shadow Chaser
88: Baby Rune Knight 88: Baby Rune Knight
89: Baby Warlock 89: Baby Warlock
90: Baby Ranger 90: Baby Ranger
91: Baby Arch Bishop 91: Baby Arch Bishop
92: Baby Mechanic 92: Baby Mechanic
93: Baby Guillotine Cross 93: Baby Guillotine Cross
94: Baby Royal Guard 94: Baby Royal Guard
95: Baby Sorcerer 95: Baby Sorcerer
96: Baby Minstrel 96: Baby Minstrel
97: Baby Wanderer 97: Baby Wanderer
98: Baby Sura 98: Baby Sura
99: Baby Genetic 99: Baby Genetic
100: Baby Shadow Chaser 100: Baby Shadow Chaser
101: Expanded Super Novice 101: Expanded Super Novice
102: Expanded Super Baby 102: Expanded Super Baby
103: Kagerou 103: Kagerou
104: Oboro 104: Oboro
105: Unknown Job 105: Unknown Job
//Auction //Auction
200: Auction Manager 200: Auction Manager
201: Auction 201: Auction
202: Thanks, you won the auction!. 202: Thanks, you won the auction!.
203: Payment for your auction!. 203: Payment for your auction!.
204: No buyers have been found for your auction. 204: No buyers have been found for your auction.
205: Auction canceled. 205: Auction canceled.
206: Auction closed. 206: Auction closed.
207: Auction winner. 207: Auction winner.
208: Someone has placed a higher bid. 208: Someone has placed a higher bid.
209: You have placed a higher bid. 209: You have placed a higher bid.
210: You have won the auction. 210: You have won the auction.
211: Payment for your auction!. 211: Payment for your auction!.

52
conf/msg_conf/login_msg.conf
View File

@ -1,26 +1,26 @@
// rAthena msg_athena.conf // rAthena msg_athena.conf
// Message Configuration of login-server // Message Configuration of login-server
// ----------------------- // -----------------------
0: Unregistered ID. 0: Unregistered ID.
1: Incorrect Password. 1: Incorrect Password.
2: Account Expired. 2: Account Expired.
3: Rejected from server. 3: Rejected from server.
4: Blocked by GM. 4: Blocked by GM.
5: Not latest game EXE. 5: Not latest game EXE.
6: Banned. 6: Banned.
7: Server Over-population. 7: Server Over-population.
8: Account limit from company 8: Account limit from company
9: Ban by DBA 9: Ban by DBA
10: Email not confirmed 10: Email not confirmed
11: Ban by GM 11: Ban by GM
12: Working in DB 12: Working in DB
13: Self Lock 13: Self Lock
14: Not Permitted Group 14: Not Permitted Group
15: Not Permitted Group 15: Not Permitted Group
16: Account gone. 16: Account gone.
17: Login info remains. 17: Login info remains.
18: Hacking investigation. 18: Hacking investigation.
19: Bug investigation. 19: Bug investigation.
20: Deleting char. 20: Deleting char.
21: Deleting spouse char. 21: Deleting spouse char.
22: Unknown Error. 22: Unknown Error.

2
config.pl
View File

@ -535,4 +535,4 @@ sub GetDesiredConf { my ($rhDefConf) = @_;
$rhUserConf=GetValidateConf($rhDefConf); $rhUserConf=GetValidateConf($rhDefConf);
} }
return $rhUserConf; return $rhUserConf;
} }

2
src/char/char.c
View File

@ -5130,4 +5130,4 @@ void display_helpscreen(bool do_exit)
ShowInfo(" --msg-config <file>\t\tAlternative message configuration.\n"); ShowInfo(" --msg-config <file>\t\tAlternative message configuration.\n");
if( do_exit ) if( do_exit )
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

274
src/common/cli.c
View File

@ -1,137 +1,137 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "cbasetypes.h" #include "cbasetypes.h"
#include "showmsg.h" #include "showmsg.h"
#include "core.h" #include "core.h"
#include "cli.h" #include "cli.h"
char* MAP_CONF_NAME; char* MAP_CONF_NAME;
char* INTER_CONF_NAME; char* INTER_CONF_NAME;
char* LOG_CONF_NAME; char* LOG_CONF_NAME;
char* BATTLE_CONF_FILENAME; char* BATTLE_CONF_FILENAME;
char* ATCOMMAND_CONF_FILENAME; char* ATCOMMAND_CONF_FILENAME;
char* SCRIPT_CONF_NAME; char* SCRIPT_CONF_NAME;
char* GRF_PATH_FILENAME; char* GRF_PATH_FILENAME;
//char //char
char* CHAR_CONF_NAME; char* CHAR_CONF_NAME;
char* SQL_CONF_NAME; char* SQL_CONF_NAME;
//login //login
char* LOGIN_CONF_NAME; char* LOGIN_CONF_NAME;
//common //common
char* LAN_CONF_NAME; //char-login char* LAN_CONF_NAME; //char-login
char* MSG_CONF_NAME; //all char* MSG_CONF_NAME; //all
bool opt_has_next_value(const char* option, int i, int argc) bool opt_has_next_value(const char* option, int i, int argc)
{ {
if (i >= argc - 1) { if (i >= argc - 1) {
ShowWarning("Missing value for option '%s'.\n", option); ShowWarning("Missing value for option '%s'.\n", option);
return false; return false;
} }
return true; return true;
} }
/*====================================================== /*======================================================
* Servers Version Screen [MC Cameri] * Servers Version Screen [MC Cameri]
*------------------------------------------------------*/ *------------------------------------------------------*/
void display_versionscreen(bool do_exit) void display_versionscreen(bool do_exit)
{ {
ShowInfo(CL_WHITE"rAthena SVN version: %s" CL_RESET"\n", get_svn_revision()); ShowInfo(CL_WHITE"rAthena SVN version: %s" CL_RESET"\n", get_svn_revision());
ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://rathena.org/\n"); ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://rathena.org/\n");
ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rathena.net/#rathena\n"); ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rathena.net/#rathena\n");
ShowInfo("Open "CL_WHITE"readme.txt"CL_RESET" for more information.\n"); ShowInfo("Open "CL_WHITE"readme.txt"CL_RESET" for more information.\n");
if (do_exit) if (do_exit)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
int cli_get_options(int argc, char ** argv) int cli_get_options(int argc, char ** argv)
{ {
int i = 0; int i = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char* arg = argv[i]; const char* arg = argv[i];
if (arg[0] != '-' && (arg[0] != '/' || arg[1] == '-')) {// -, -- and / if (arg[0] != '-' && (arg[0] != '/' || arg[1] == '-')) {// -, -- and /
ShowError("Unknown option '%s'.\n", argv[i]); ShowError("Unknown option '%s'.\n", argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} else if ((++arg)[0] == '-') {// long option } else if ((++arg)[0] == '-') {// long option
arg++; arg++;
if (strcmp(arg, "help") == 0) { if (strcmp(arg, "help") == 0) {
display_helpscreen(true); display_helpscreen(true);
} else if (strcmp(arg, "version") == 0) { } else if (strcmp(arg, "version") == 0) {
display_versionscreen(true); display_versionscreen(true);
} else if (strcmp(arg, "msg-config") == 0) { } else if (strcmp(arg, "msg-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
MSG_CONF_NAME = argv[++i]; MSG_CONF_NAME = argv[++i];
} else if (strcmp(arg, "run-once") == 0) // close the map-server as soon as its done.. for testing [Celest] } else if (strcmp(arg, "run-once") == 0) // close the map-server as soon as its done.. for testing [Celest]
{ {
runflag = CORE_ST_STOP; runflag = CORE_ST_STOP;
} else if (SERVER_TYPE & (ATHENA_SERVER_LOGIN | ATHENA_SERVER_CHAR)) { //login or char } else if (SERVER_TYPE & (ATHENA_SERVER_LOGIN | ATHENA_SERVER_CHAR)) { //login or char
if (strcmp(arg, "lan-config") == 0) { if (strcmp(arg, "lan-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
LAN_CONF_NAME = argv[++i]; LAN_CONF_NAME = argv[++i];
} else if (SERVER_TYPE == ATHENA_SERVER_LOGIN) { //login } else if (SERVER_TYPE == ATHENA_SERVER_LOGIN) { //login
if (strcmp(arg, "login-config") == 0) { if (strcmp(arg, "login-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
LOGIN_CONF_NAME = argv[++i]; LOGIN_CONF_NAME = argv[++i];
} else { } else {
ShowError("Unknown option '%s'.\n", argv[i]); ShowError("Unknown option '%s'.\n", argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} else if (SERVER_TYPE == ATHENA_SERVER_CHAR) { //char } else if (SERVER_TYPE == ATHENA_SERVER_CHAR) { //char
if (strcmp(arg, "char-config") == 0) { if (strcmp(arg, "char-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
CHAR_CONF_NAME = argv[++i]; CHAR_CONF_NAME = argv[++i];
} else if (strcmp(arg, "inter-config") == 0) { } else if (strcmp(arg, "inter-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
INTER_CONF_NAME = argv[++i]; INTER_CONF_NAME = argv[++i];
} else { } else {
ShowError("Unknown option '%s'.\n", argv[i]); ShowError("Unknown option '%s'.\n", argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
} else if (SERVER_TYPE == ATHENA_SERVER_MAP) { //map } else if (SERVER_TYPE == ATHENA_SERVER_MAP) { //map
if (strcmp(arg, "map-config") == 0) { if (strcmp(arg, "map-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
MAP_CONF_NAME = argv[++i]; MAP_CONF_NAME = argv[++i];
} else if (strcmp(arg, "battle-config") == 0) { } else if (strcmp(arg, "battle-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
BATTLE_CONF_FILENAME = argv[++i]; BATTLE_CONF_FILENAME = argv[++i];
} else if (strcmp(arg, "atcommand-config") == 0) { } else if (strcmp(arg, "atcommand-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
ATCOMMAND_CONF_FILENAME = argv[++i]; ATCOMMAND_CONF_FILENAME = argv[++i];
} else if (strcmp(arg, "script-config") == 0) { } else if (strcmp(arg, "script-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
SCRIPT_CONF_NAME = argv[++i]; SCRIPT_CONF_NAME = argv[++i];
} else if (strcmp(arg, "grf-path-file") == 0) { } else if (strcmp(arg, "grf-path-file") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
GRF_PATH_FILENAME = argv[++i]; GRF_PATH_FILENAME = argv[++i];
} else if (strcmp(arg, "inter-config") == 0) { } else if (strcmp(arg, "inter-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
INTER_CONF_NAME = argv[++i]; INTER_CONF_NAME = argv[++i];
} else if (strcmp(arg, "log-config") == 0) { } else if (strcmp(arg, "log-config") == 0) {
if (opt_has_next_value(arg, i, argc)) if (opt_has_next_value(arg, i, argc))
LOG_CONF_NAME = argv[++i]; LOG_CONF_NAME = argv[++i];
} }
else { else {
ShowError("Unknown option '%s'.\n", argv[i]); ShowError("Unknown option '%s'.\n", argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
} else switch (arg[0]) {// short option } else switch (arg[0]) {// short option
case '?': case '?':
case 'h': case 'h':
display_helpscreen(true); display_helpscreen(true);
break; break;
case 'v': case 'v':
display_versionscreen(true); display_versionscreen(true);
break; break;
default: default:
ShowError("Unknown option '%s'.\n", argv[i]); ShowError("Unknown option '%s'.\n", argv[i]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
return 1; return 1;
} }

80
src/common/cli.h
View File

@ -1,40 +1,40 @@
/* /*
* File: cli.h * File: cli.h
* Author: lighta * Author: lighta
* *
* Created on February 21, 2013, 6:15 PM * Created on February 21, 2013, 6:15 PM
*/ */
#ifndef CLI_H #ifndef CLI_H
#define CLI_H #define CLI_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
//map //map
extern char* MAP_CONF_NAME; extern char* MAP_CONF_NAME;
extern char* INTER_CONF_NAME; extern char* INTER_CONF_NAME;
extern char* LOG_CONF_NAME; extern char* LOG_CONF_NAME;
extern char* BATTLE_CONF_FILENAME; extern char* BATTLE_CONF_FILENAME;
extern char* ATCOMMAND_CONF_FILENAME; extern char* ATCOMMAND_CONF_FILENAME;
extern char* SCRIPT_CONF_NAME; extern char* SCRIPT_CONF_NAME;
extern char* GRF_PATH_FILENAME; extern char* GRF_PATH_FILENAME;
//char //char
extern char* CHAR_CONF_NAME; extern char* CHAR_CONF_NAME;
extern char* SQL_CONF_NAME; extern char* SQL_CONF_NAME;
//login //login
extern char* LOGIN_CONF_NAME; extern char* LOGIN_CONF_NAME;
//common //common
extern char* LAN_CONF_NAME; //char-login extern char* LAN_CONF_NAME; //char-login
extern char* MSG_CONF_NAME; //all extern char* MSG_CONF_NAME; //all
extern void display_helpscreen(bool exit); extern void display_helpscreen(bool exit);
int cli_get_options(int argc, char ** argv); int cli_get_options(int argc, char ** argv);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* CLI_H */ #endif /* CLI_H */

144
src/common/msg_conf.c
View File

@ -1,72 +1,72 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "malloc.h" #include "malloc.h"
#include "msg_conf.h" #include "msg_conf.h"
#include "showmsg.h" #include "showmsg.h"
//----------------------------------------------------------- //-----------------------------------------------------------
// Return the message string of the specified number by [Yor] // Return the message string of the specified number by [Yor]
//----------------------------------------------------------- //-----------------------------------------------------------
const char* _msg_txt(int msg_number,int size, char ** msg_table) const char* _msg_txt(int msg_number,int size, char ** msg_table)
{ {
if (msg_number >= 0 && msg_number < size && if (msg_number >= 0 && msg_number < size &&
msg_table[msg_number] != NULL && msg_table[msg_number][0] != '\0') msg_table[msg_number] != NULL && msg_table[msg_number][0] != '\0')
return msg_table[msg_number]; return msg_table[msg_number];
return "??"; return "??";
} }
/*========================================== /*==========================================
* Read Message Data * Read Message Data
*------------------------------------------*/ *------------------------------------------*/
int _msg_config_read(const char* cfgName,int size, char ** msg_table) int _msg_config_read(const char* cfgName,int size, char ** msg_table)
{ {
int msg_number; int msg_number;
char line[1024], w1[1024], w2[1024]; char line[1024], w1[1024], w2[1024];
FILE *fp; FILE *fp;
static int called = 1; static int called = 1;
if ((fp = fopen(cfgName, "r")) == NULL) { if ((fp = fopen(cfgName, "r")) == NULL) {
ShowError("Messages file not found: %s\n", cfgName); ShowError("Messages file not found: %s\n", cfgName);
return 1; return 1;
} }
if ((--called) == 0) if ((--called) == 0)
memset(msg_table, 0, sizeof (msg_table[0]) * size); memset(msg_table, 0, sizeof (msg_table[0]) * size);
while (fgets(line, sizeof (line), fp)) { while (fgets(line, sizeof (line), fp)) {
if (line[0] == '/' && line[1] == '/') if (line[0] == '/' && line[1] == '/')
continue; continue;
if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2) if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
continue; continue;
if (strcmpi(w1, "import") == 0) if (strcmpi(w1, "import") == 0)
_msg_config_read(w2,size,msg_table); _msg_config_read(w2,size,msg_table);
else { else {
msg_number = atoi(w1); msg_number = atoi(w1);
if (msg_number >= 0 && msg_number < size) { if (msg_number >= 0 && msg_number < size) {
if (msg_table[msg_number] != NULL) if (msg_table[msg_number] != NULL)
aFree(msg_table[msg_number]); aFree(msg_table[msg_number]);
msg_table[msg_number] = (char *) aMalloc((strlen(w2) + 1) * sizeof (char)); msg_table[msg_number] = (char *) aMalloc((strlen(w2) + 1) * sizeof (char));
strcpy(msg_table[msg_number], w2); strcpy(msg_table[msg_number], w2);
} }
} }
} }
fclose(fp); fclose(fp);
ShowInfo("Finished reading %s.\n",cfgName); ShowInfo("Finished reading %s.\n",cfgName);
return 0; return 0;
} }
/*========================================== /*==========================================
* Cleanup Message Data * Cleanup Message Data
*------------------------------------------*/ *------------------------------------------*/
void _do_final_msg(int size, char ** msg_table){ void _do_final_msg(int size, char ** msg_table){
int i; int i;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
aFree(msg_table[i]); aFree(msg_table[i]);
} }

40
src/common/msg_conf.h
View File

@ -1,20 +1,20 @@
// Copyright (c) Athena Dev Teams - Licensed under GNU GPL // Copyright (c) Athena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder // For more information, see LICENCE in the main folder
#ifndef MSG_CONF_H #ifndef MSG_CONF_H
#define MSG_CONF_H #define MSG_CONF_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
const char* _msg_txt(int msg_number,int size, char ** msg_table); const char* _msg_txt(int msg_number,int size, char ** msg_table);
int _msg_config_read(const char* cfgName,int size, char ** msg_table); int _msg_config_read(const char* cfgName,int size, char ** msg_table);
void _do_final_msg(int size, char ** msg_table); void _do_final_msg(int size, char ** msg_table);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* MSG_CONF_H */ #endif /* MSG_CONF_H */

2
tools/config.pl
View File

@ -549,4 +549,4 @@ sub GetDesiredConf { my ($rhDefConf) = @_;
$rhUserConf=GetValidateConf($rhDefConf); $rhUserConf=GetValidateConf($rhDefConf);
} }
return $rhUserConf; return $rhUserConf;
} }

3
uninstall.sh
View File

@ -18,6 +18,5 @@ case $1 in
echo "Uninstallation succed" echo "Uninstallation succed"
;; ;;
'*') '*')
echo "Please enter a target usage './uninstall { all | bin }'" echo "Please enter a target usage './uninstall { all | bin }'"
esac esac