![Guy Harris](/assets/img/avatar_default.png)
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>
71 lines
1.8 KiB
C
71 lines
1.8 KiB
C
/* 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;
|
|
}
|