src/hg/hgsql/hgsql.c 1.11
1.11 2010/03/23 23:19:18 markd
make functionality match usage message by making the database optional on the command line
Index: src/hg/hgsql/hgsql.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgsql/hgsql.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -B -U 1000000 -r1.10 -r1.11
--- src/hg/hgsql/hgsql.c 1 Mar 2008 07:55:20 -0000 1.10
+++ src/hg/hgsql/hgsql.c 23 Mar 2010 23:19:18 -0000 1.11
@@ -1,39 +1,39 @@
/* hgsql - Execute some sql code using passwords in .hg.conf. */
#include "common.h"
#include "options.h"
#include "hgConfig.h"
#include "sqlProg.h"
static char const rcsid[] = "$Id$";
void usage()
/* Explain usage and exit. */
{
errAbort(
"hgsql - Execute some sql code using passwords in .hg.conf\n"
"usage:\n"
" hgsql [mysqlOptions] [database]\n"
"or:\n"
" hgsql [mysqlOptions] [database] < file.sql\n"
"Generally anything in command line is passed to mysql\n"
"after an implicit '-A -u user -ppassword'. If no options\n"
"or database is specified, this usage message is printed."
"\n"
);
}
void hgsql(int argc, char *argv[])
/* hgsql - Execute some sql code using passwords in .hg.conf. */
{
static char *progArgs[] = {"-A", NULL};
sqlExecProg("mysql", progArgs, argc, argv);
}
int main(int argc, char *argv[])
/* Process command line. */
{
-if (argc <= 1)
+if (argc < 1)
usage();
hgsql(argc-1, argv+1);
return 0; /* never reaches here */
}