mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Applied patch from Larry Doolittle to remove some strlen calls, and add one
paranoia check to avoid buffer underrun. Saves 120 text bytes.
This commit is contained in:
parent
de1b262942
commit
af030496fa
17
getopt.c
17
getopt.c
@ -243,20 +243,23 @@ void add_longopt(const char *name,int has_arg)
|
||||
*/
|
||||
void add_long_options(char *options)
|
||||
{
|
||||
int arg_opt;
|
||||
int arg_opt, tlen;
|
||||
char *tokptr=strtok(options,", \t\n");
|
||||
while (tokptr) {
|
||||
arg_opt=no_argument;
|
||||
if (strlen(tokptr) > 0) {
|
||||
if (tokptr[strlen(tokptr)-1] == ':') {
|
||||
if (tokptr[strlen(tokptr)-2] == ':') {
|
||||
tokptr[strlen(tokptr)-2]='\0';
|
||||
tlen=strlen(tokptr);
|
||||
if (tlen > 0) {
|
||||
if (tokptr[tlen-1] == ':') {
|
||||
if (tlen > 1 && tokptr[tlen-2] == ':') {
|
||||
tokptr[tlen-2]='\0';
|
||||
tlen -= 2;
|
||||
arg_opt=optional_argument;
|
||||
} else {
|
||||
tokptr[strlen(tokptr)-1]='\0';
|
||||
tokptr[tlen-1]='\0';
|
||||
tlen -= 1;
|
||||
arg_opt=required_argument;
|
||||
}
|
||||
if (strlen(tokptr) == 0)
|
||||
if (tlen == 0)
|
||||
error_msg("empty long option after -l or --long argument");
|
||||
}
|
||||
add_longopt(tokptr,arg_opt);
|
||||
|
@ -243,20 +243,23 @@ void add_longopt(const char *name,int has_arg)
|
||||
*/
|
||||
void add_long_options(char *options)
|
||||
{
|
||||
int arg_opt;
|
||||
int arg_opt, tlen;
|
||||
char *tokptr=strtok(options,", \t\n");
|
||||
while (tokptr) {
|
||||
arg_opt=no_argument;
|
||||
if (strlen(tokptr) > 0) {
|
||||
if (tokptr[strlen(tokptr)-1] == ':') {
|
||||
if (tokptr[strlen(tokptr)-2] == ':') {
|
||||
tokptr[strlen(tokptr)-2]='\0';
|
||||
tlen=strlen(tokptr);
|
||||
if (tlen > 0) {
|
||||
if (tokptr[tlen-1] == ':') {
|
||||
if (tlen > 1 && tokptr[tlen-2] == ':') {
|
||||
tokptr[tlen-2]='\0';
|
||||
tlen -= 2;
|
||||
arg_opt=optional_argument;
|
||||
} else {
|
||||
tokptr[strlen(tokptr)-1]='\0';
|
||||
tokptr[tlen-1]='\0';
|
||||
tlen -= 1;
|
||||
arg_opt=required_argument;
|
||||
}
|
||||
if (strlen(tokptr) == 0)
|
||||
if (tlen == 0)
|
||||
error_msg("empty long option after -l or --long argument");
|
||||
}
|
||||
add_longopt(tokptr,arg_opt);
|
||||
|
Loading…
Reference in New Issue
Block a user