From accb1e2891584749d7640eb70555a3eb1eef4481 Mon Sep 17 00:00:00 2001 From: prabatuty Date: Sat, 10 Oct 2009 11:32:04 +0000 Subject: [PATCH] when no option is specified it should print help message --- src/tools/csqlds.cxx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/tools/csqlds.cxx b/src/tools/csqlds.cxx index b2c8eb93..c34f43cf 100644 --- a/src/tools/csqlds.cxx +++ b/src/tools/csqlds.cxx @@ -32,7 +32,7 @@ void printUsage() DbRetVal removeEntryFromCsqlds(char *dsn); DbRetVal addEntryToCsqlds(char *dsn, char *uname, char *pwd, char *tbdname); Config Conf::config; -bool shouldadd=false; +int shouldadd=0; int main(int argc, char **argv) { Conf::config.readAllValues(os::getenv("CSQL_CONFIG_FILE")); @@ -68,8 +68,8 @@ int main(int argc, char **argv) break; } case '?' : {showmsg=true; break; } //print help - case 'r' : { shouldadd=false; break;} - case 'a' : { shouldadd=true; break; } + case 'a' : { shouldadd=1; break; } + case 'r' : { shouldadd=2; break;} default: opt=10; } }//while options @@ -84,7 +84,7 @@ int main(int argc, char **argv) strcpy(password, "NULL"); } - if(shouldadd) + if(shouldadd == 1) { if(opt==3){ addEntryToCsqlds( dsn,username,password,tdbname); @@ -94,9 +94,13 @@ int main(int argc, char **argv) return 0; } - }else + }else if (shouldadd == 2) { removeEntryFromCsqlds(dsn); + }else + { + printf("Invalid option passed\n"); + printUsage(); } return 0; } -- 2.11.4.GIT