nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-08-31 07:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle --help as success

Browse Source 
whois --help output should go to standard output, and exit code should
be zero.
This commit is contained in:
Petr Písař 2013-04-09 14:20:41 +02:00 committed by Marco d'Itri
parent 3f0c3d4436
commit 361164fea5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
whois.c
View File

@ -72,9 +72,9 @@ const char *client_tag = IDSTRING;
#ifdef HAVE_GETOPT_LONG
static const struct option longopts[] = {
{"help", no_argument, NULL, 0 },
{"version", no_argument, NULL, 1 },
{"verbose", no_argument, NULL, 2 },
{"help", no_argument, NULL, 3 },
{"server", required_argument, NULL, 'h'},
{"host", required_argument, NULL, 'h'},
{"port", required_argument, NULL, 'p'},
@ -139,22 +139,24 @@ int main(int argc, char *argv[])
case 'p':
port = strdup(optarg);
break;
case 3:
usage(EXIT_SUCCESS);
case 2:
verb = 1;
break;
case 1:
fprintf(stderr, _("Version %s.\n\nReport bugs to %s.\n"),
fprintf(stdout, _("Version %s.\n\nReport bugs to %s.\n"),
VERSION, "<md+whois@linux.it>");
exit(0);
exit(EXIT_SUCCESS);
default:
usage();
usage(EXIT_FAILURE);
}
}
argc -= optind;
argv += optind;
if (argc == 0 && !nopar) /* there is no parameter */
usage();
usage(EXIT_FAILURE);
/* On some systems realloc only works on non-NULL buffers */
/* I wish I could remember which ones they are... */
@ -1181,9 +1183,9 @@ int isasciidigit(const char c) {
/* http://www.ripe.net/ripe/docs/databaseref-manual.html */
void usage(void)
void usage(int error)
{
fprintf(stderr, _(
fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
"Usage: whois [OPTION]... OBJECT...\n\n"
"-h HOST, --host HOST connect to server HOST\n"
"-p PORT, --port PORT connect to PORT\n"
@ -1217,6 +1219,6 @@ void usage(void)
"-q [version|sources|types] query specified server info\n"
"-F fast raw output (implies -r)\n"
));
exit(0);
exit(error);
}

2
whois.h
View File

@ -21,7 +21,7 @@ const char *query_pir(const int, const char *);
const char *query_afilias(const int, const char *);
int openconn(const char *, const char *);
int connect_with_timeout(int, const struct sockaddr *, socklen_t, int);
void usage(void);
void usage(int error);
void alarm_handler(int);
void sighandler(int);
int japanese_locale(void);