emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Applied patch from Larry Doolittle to remove some strlen calls, and add one

Browse Source 
paranoia check to avoid  buffer underrun. Saves 120 text bytes.
This commit is contained in:
Mark Whitley 2001-04-23 23:16:20 +00:00
parent de1b262942
commit af030496fa
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
getopt.c
View File

@ -243,20 +243,23 @@ void add_longopt(const char *name,int has_arg)
*/ */
void add_long_options(char *options) void add_long_options(char *options)
{ {
int arg_opt; int arg_opt, tlen;
char *tokptr=strtok(options,", \t\n"); char *tokptr=strtok(options,", \t\n");
while (tokptr) { while (tokptr) {
arg_opt=no_argument; arg_opt=no_argument;
if (strlen(tokptr) > 0) { tlen=strlen(tokptr);
if (tokptr[strlen(tokptr)-1] == ':') { if (tlen > 0) {
if (tokptr[strlen(tokptr)-2] == ':') { if (tokptr[tlen-1] == ':') {
tokptr[strlen(tokptr)-2]='\0'; if (tlen > 1 && tokptr[tlen-2] == ':') {
tokptr[tlen-2]='\0';
tlen -= 2;
arg_opt=optional_argument; arg_opt=optional_argument;
} else { } else {
tokptr[strlen(tokptr)-1]='\0'; tokptr[tlen-1]='\0';
tlen -= 1;
arg_opt=required_argument; arg_opt=required_argument;
} }
if (strlen(tokptr) == 0) if (tlen == 0)
error_msg("empty long option after -l or --long argument"); error_msg("empty long option after -l or --long argument");
} }
add_longopt(tokptr,arg_opt); add_longopt(tokptr,arg_opt);

17
util-linux/getopt.c
View File

@ -243,20 +243,23 @@ void add_longopt(const char *name,int has_arg)
*/ */
void add_long_options(char *options) void add_long_options(char *options)
{ {
int arg_opt; int arg_opt, tlen;
char *tokptr=strtok(options,", \t\n"); char *tokptr=strtok(options,", \t\n");
while (tokptr) { while (tokptr) {
arg_opt=no_argument; arg_opt=no_argument;
if (strlen(tokptr) > 0) { tlen=strlen(tokptr);
if (tokptr[strlen(tokptr)-1] == ':') { if (tlen > 0) {
if (tokptr[strlen(tokptr)-2] == ':') { if (tokptr[tlen-1] == ':') {
tokptr[strlen(tokptr)-2]='\0'; if (tlen > 1 && tokptr[tlen-2] == ':') {
tokptr[tlen-2]='\0';
tlen -= 2;
arg_opt=optional_argument; arg_opt=optional_argument;
} else { } else {
tokptr[strlen(tokptr)-1]='\0'; tokptr[tlen-1]='\0';
tlen -= 1;
arg_opt=required_argument; arg_opt=required_argument;
} }
if (strlen(tokptr) == 0) if (tlen == 0)
error_msg("empty long option after -l or --long argument"); error_msg("empty long option after -l or --long argument");
} }
add_longopt(tokptr,arg_opt); add_longopt(tokptr,arg_opt);