diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-05-10 23:37:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-05-10 23:37:32 +0000 |
| commit | 43b0e40f85770cd1f362c3abbad41e09bd9f0b17 (patch) | |
| tree | 799af104f1ab7419ac37f0d9a8d5d34a73bba54b /argp | |
| parent | 8b13cb56b3433bed5233840af66127a745c27718 (diff) | |
| download | glibc-43b0e40f85770cd1f362c3abbad41e09bd9f0b17.tar.gz glibc-43b0e40f85770cd1f362c3abbad41e09bd9f0b17.tar.xz glibc-43b0e40f85770cd1f362c3abbad41e09bd9f0b17.zip | |
Update. cvs/libc-ud-970511
1997-05-10 11:46 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/rpcsvc/nis_callback.x: New, from tirpcsrc-2.3. * nis/nis_call.c (__nis_docall): Rewritten for navigation in NIS+ namespace hierachy. * nis/nis_intern.h: Add new __nis_docall function prototypes. * nis/nis_add.c: Change __nis_docall/__nis_docall2 parameters for new rewritten functions. * nis/nis_checkpoint.c: Likewise. * nis/nis_lookup.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_modify.c: Likewise. * nis/nis_ping.c: Likewise. * nis/nis_remove.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_server.c: Likewise. * nis/nis_table.c: Likewise. 1997-05-09 16:09 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-eexst.c: Include <sysexits.h>. (argp_err_exit_status): Initialize to EX_USAGE. * argp/argp.h, argp/argp-help.c: Doc fixes. 1997-05-08 17:15 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp.h [!__error_t_defined] (__error_t_defined): Define. * argp/argp-help.c (canon_doc_option): Correct ctype tests.
Diffstat (limited to 'argp')
| -rw-r--r-- | argp/argp-eexst.c | 7 | ||||
| -rw-r--r-- | argp/argp-help.c | 6 | ||||
| -rw-r--r-- | argp/argp.h | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/argp/argp-eexst.c b/argp/argp-eexst.c index 676d1ec517..9040058e4a 100644 --- a/argp/argp-eexst.c +++ b/argp/argp-eexst.c @@ -22,8 +22,11 @@ #include <config.h> #endif +#include <sysexits.h> + #include "argp.h" /* The exit status that argp will use when exiting due to a parsing error. - If not defined or set by the user program, this defaults to 1. */ -error_t argp_err_exit_status = 1; + If not defined or set by the user program, this defaults to EX_USAGE from + <sysexits.h>. */ +error_t argp_err_exit_status = EX_USAGE; diff --git a/argp/argp-help.c b/argp/argp-help.c index ed934e0e3a..b17c56d3a5 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -658,12 +658,12 @@ canon_doc_option (const char **name) { int non_opt; /* Skip initial whitespace. */ - while (isspace (*name)) + while (isspace (**name)) (*name)++; /* Decide whether this looks like an option (leading `-') or not. */ non_opt = (**name != '-'); /* Skip until part of name used for sorting. */ - while (**name && !isalnum (*name)) + while (**name && !isalnum (**name)) (*name)++; return non_opt; } @@ -1612,7 +1612,7 @@ weak_alias (__argp_state_help, argp_state_help) /* If appropriate, print the printf string FMT and following args, preceded by the program name and `:', to stderr, and followed by a `Try ... --help' - message, then exit (ARGP_ERR_EXIT_STATUS). */ + message, then exit (1). */ void __argp_error (const struct argp_state *state, const char *fmt, ...) { diff --git a/argp/argp.h b/argp/argp.h index d418253692..6f430d4c23 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -34,6 +34,7 @@ #ifndef __error_t_defined typedef int error_t; +#define __error_t_defined #endif #ifndef __P @@ -397,7 +398,8 @@ extern void (*argp_program_version_hook) __P ((FILE *__stream, __const extern char *argp_program_bug_address; /* The exit status that argp will use when exiting due to a parsing error. - If not defined or set by the user program, this defaults to 1. */ + If not defined or set by the user program, this defaults to EX_USAGE from + <sysexits.h>. */ extern error_t argp_err_exit_status; /* Flags for argp_help. */ |