diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-06-29 14:37:21 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-06-29 23:03:24 +0000 |
commit | fe42762f236e23fefe47e67b6c248507d0ac5c8a (patch) | |
tree | 57947515414aa27789b5aea2b1e4d32c0da7e97e /wsutil | |
parent | dd63ae2b8c889aa91577efe4621e6d0fe5432a99 (diff) |
Move some more stuff into wsutil.
Move the routines to parse numerical command-line arguments there.
Make cmdarg_err() and cmdarg_err_cont() routines in wsutil that just
call routines specified by a call to cmdarg_err_init(), and have
programs supply the appropriate routines to it.
Change-Id: Ic24fc758c0e647f4ff49eb91673529bcb9587b01
Reviewed-on: https://code.wireshark.org/review/2704
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/CMakeLists.txt | 2 | ||||
-rw-r--r-- | wsutil/Makefile.common | 6 | ||||
-rw-r--r-- | wsutil/clopts_common.c | 70 | ||||
-rw-r--r-- | wsutil/clopts_common.h | 42 | ||||
-rw-r--r-- | wsutil/cmdarg_err.c | 67 | ||||
-rw-r--r-- | wsutil/cmdarg_err.h | 61 |
6 files changed, 247 insertions, 1 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 0157e74785..d8e2f04de1 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -45,6 +45,8 @@ set(WSUTIL_FILES base64.c bitswap.c cfutils.c + clopts_common.c + cmdarg_err.c compiler_info.c copyright_info.c cpu_info.c diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 4bb8dea86b..2c0595c94e 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -33,6 +33,8 @@ LIBWSUTIL_SRC = \ base64.c \ bitswap.c \ cfutils.c \ + clopts_common.c \ + cmdarg_err.c \ compiler_info.c \ copyright_info.c \ cpu_info.c \ @@ -79,8 +81,10 @@ LIBWSUTIL_INCLUDES = \ base64.h \ bits_ctz.h \ bits_count_ones.h \ - bitswap.h \ + bitswap.h \ cfutils.h \ + clopts_common.h \ + cmdarg_err.h \ compiler_info.h \ copyright_info.h \ cpu_info.h \ diff --git a/wsutil/clopts_common.c b/wsutil/clopts_common.c new file mode 100644 index 0000000000..8b1878758b --- /dev/null +++ b/wsutil/clopts_common.c @@ -0,0 +1,70 @@ +/* clopts_common.c + * Handle command-line arguments common to various programs + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include <wsutil/cmdarg_err.h> + +#include <wsutil/clopts_common.h> + +int +get_natural_int(const char *string, const char *name) +{ + long number; + char *p; + + number = strtol(string, &p, 10); + if (p == string || *p != '\0') { + cmdarg_err("The specified %s \"%s\" isn't a decimal number", name, string); + exit(1); + } + if (number < 0) { + cmdarg_err("The specified %s \"%s\" is a negative number", name, string); + exit(1); + } + if (number > INT_MAX) { + cmdarg_err("The specified %s \"%s\" is too large (greater than %d)", + name, string, INT_MAX); + exit(1); + } + return (int)number; +} + + +int +get_positive_int(const char *string, const char *name) +{ + int number; + + number = get_natural_int(string, name); + + if (number == 0) { + cmdarg_err("The specified %s is zero", name); + exit(1); + } + + return number; +} diff --git a/wsutil/clopts_common.h b/wsutil/clopts_common.h new file mode 100644 index 0000000000..c409e8957a --- /dev/null +++ b/wsutil/clopts_common.h @@ -0,0 +1,42 @@ +/* clopts_common.h + * Handle command-line arguments common to various programs + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __WSUTIL_CLOPTS_COMMON_H__ +#define __WSUTIL_CLOPTS_COMMON_H__ + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +WS_DLL_PUBLIC int +get_natural_int(const char *string, const char *name); + +WS_DLL_PUBLIC int +get_positive_int(const char *string, const char *name); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __WSUTIL_CLOPTS_COMMON_H__ */ diff --git a/wsutil/cmdarg_err.c b/wsutil/cmdarg_err.c new file mode 100644 index 0000000000..7dd2fa23c6 --- /dev/null +++ b/wsutil/cmdarg_err.c @@ -0,0 +1,67 @@ +/* cmdarg_err.c + * Routines to report command-line argument errors. + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <stdio.h> + +#include <wsutil/cmdarg_err.h> + +static void (*print_err)(const char *, va_list ap); +static void (*print_err_cont)(const char *, va_list ap); + +/* + * Set the reporting functions for error messages. + */ +void +cmdarg_err_init(void (*err)(const char *, va_list), + void (*err_cont)(const char *, va_list)) +{ + print_err = err; + print_err_cont = err_cont; +} + +/* + * Report an error in command-line arguments. + */ +void +cmdarg_err(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + print_err(fmt, ap); + va_end(ap); +} + +/* + * Report additional information for an error in command-line arguments. + */ +void +cmdarg_err_cont(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + print_err_cont(fmt, ap); + va_end(ap); +} diff --git a/wsutil/cmdarg_err.h b/wsutil/cmdarg_err.h new file mode 100644 index 0000000000..169c893b9f --- /dev/null +++ b/wsutil/cmdarg_err.h @@ -0,0 +1,61 @@ +/* cmdarg_err.h + * Declarations of routines to report command-line argument errors. + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __WSUTIL_CMDARG_ERR_H__ +#define __WSUTIL_CMDARG_ERR_H__ + +#include <stdarg.h> + +#include <glib.h> + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* + * Set the reporting functions for error messages. + */ +WS_DLL_PUBLIC void +cmdarg_err_init(void (*err)(const char *, va_list), + void (*err_cont)(const char *, va_list)); + +/* + * Report an error in command-line arguments. + */ +WS_DLL_PUBLIC void +cmdarg_err(const char *fmt, ...) + G_GNUC_PRINTF(1, 2); + +/* + * Report additional information for an error in command-line arguments. + */ +WS_DLL_PUBLIC void +cmdarg_err_cont(const char *fmt, ...) + G_GNUC_PRINTF(1, 2); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __WSUTIL_CMDARG_ERR_H__ */ |