From cf4822fb8f31ac4f586d1ccd678696502a9a05b5 Mon Sep 17 00:00:00 2001 From: oga Date: Wed, 13 Feb 2008 21:04:19 +0000 Subject: add usage() for when an unknown option is given. from Gleydson Soares , thanks! ok jasper@ --- calmwm.c | 13 +++++++++++-- calmwm.h | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/calmwm.c b/calmwm.c index 1633c30..2ae813d 100644 --- a/calmwm.c +++ b/calmwm.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.c,v 1.8 2008/02/13 12:09:47 oga Exp $ + * $Id: calmwm.c,v 1.9 2008/02/13 21:04:19 oga Exp $ */ #include "headers.h" @@ -71,7 +71,7 @@ main(int argc, char **argv) DefaultFontName = xstrdup(optarg); break; default: - errx(1, "Unknown option '%c'", ch); + usage(); } } argc -= optind; @@ -321,3 +321,12 @@ _sigchld_cb(int which) (pid < 0 && errno == EINTR)) ; } + +void +usage(void) +{ + extern char *__progname; + + fprintf(stderr, "usage: %s [-s] [-d display] [-f fontname] \n", __progname); + exit(1); +} diff --git a/calmwm.h b/calmwm.h index 50e7c33..8446718 100644 --- a/calmwm.h +++ b/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.h,v 1.19 2008/01/16 11:39:20 oga Exp $ + * $Id: calmwm.h,v 1.20 2008/02/13 21:04:19 oga Exp $ */ #ifndef _CALMWM_H_ @@ -312,6 +312,7 @@ int x_errorhandler(Display *, XErrorEvent *); void x_setup(char *display_name); char *x_screenname(int); void x_setupscreen(struct screen_ctx *, u_int); +void usage(void); struct client_ctx *client_find(Window); void client_setup(void); -- cgit v1.2.3-2-gb3c3