Merge in bug fixes for client tools

This commit is contained in:
Jim Winstead 2009-07-14 10:08:38 -07:00
commit bd0a44fba2
13 changed files with 193 additions and 58 deletions

View file

@ -253,8 +253,12 @@ get_one_option(int optid, const struct my_option *opt,
break;
case 'b': /* --basedir */
case 'v': /* --verbose */
case 'd': /* --datadir */
fprintf(stderr, "%s: the '--%s' option is always ignored\n",
my_progname, optid == 'b' ? "basedir" : "datadir");
/* FALLTHROUGH */
case 'v': /* --verbose */
case 'f': /* --force */
add_option= FALSE;
break;