* <misiek@misiek.eu.org>)
* Ported to Busybox - Alfred M. Szmidt <ams@trillian.itslinux.org>
* Removed --version/-V and --help/-h in
- * Removed prase_error(), using error_msg() from Busybox instead
+ * Removed parse_error(), using bb_error_msg() from Busybox instead
* Replaced our_malloc with xmalloc and our_realloc with xrealloc
*
*/
const char *argptr=arg;
char *bufptr;
- if (BUFFER != NULL)
- free(BUFFER);
+ free(BUFFER);
if (!quote) { /* Just copy arg */
- BUFFER=xstrdup(arg);
+ BUFFER=bb_xstrdup(arg);
return BUFFER;
}
- /* Each character in arg may take upto four characters in the result:
+ /* Each character in arg may take up to four characters in the result:
For a quote we need a closing quote, a backslash, a quote and an
opening quote! We need also the global opening and closing quote,
and one extra character for '\0'. */
long_options[long_options_nr-1].has_arg=has_arg;
long_options[long_options_nr-1].flag=NULL;
long_options[long_options_nr-1].val=LONG_OPT;
- long_options[long_options_nr-1].name=xstrdup(name);
+ long_options[long_options_nr-1].name=bb_xstrdup(name);
}
long_options_nr++;
}
arg_opt=required_argument;
}
if (tlen == 0)
- error_msg("empty long option after -l or --long argument");
+ bb_error_msg("empty long option after -l or --long argument");
}
add_longopt(tokptr,arg_opt);
}
else if (!strcmp(new_shell,"csh"))
shell=TCSH;
else
- error_msg("unknown shell after -s or --shell argument");
+ bb_error_msg("unknown shell after -s or --shell argument");
}
/* Exit codes:
- * 0) No errors, succesful operation.
+ * 0) No errors, successful operation.
* 1) getopt(3) returned an error.
* 2) A problem with parameter parsing for getopt(1).
* 3) Internal error, out of memory
int getopt_main(int argc, char *argv[])
{
- char *optstr=NULL;
- char *name=NULL;
+ const char *optstr = NULL;
+ const char *name = NULL;
int opt;
int compatible=0;
printf(" --\n");
return 0;
} else
- error_msg_and_die("missing optstring argument");
+ bb_error_msg_and_die("missing optstring argument");
}
if (argv[1][0] != '-' || compatible) {
alternative=1;
break;
case 'o':
- if (optstr)
- free(optstr);
- optstr=xstrdup(optarg);
+ free(optstr);
+ optstr = optarg;
break;
case 'l':
add_long_options(optarg);
break;
case 'n':
- if (name)
- free(name);
- name=xstrdup(optarg);
+ free(name);
+ name = optarg;
break;
case 'q':
quiet_errors=1;
quote=0;
break;
default:
- show_usage();
+ bb_show_usage();
}
if (!optstr) {
if (optind >= argc)
- error_msg_and_die("missing optstring argument");
+ bb_error_msg_and_die("missing optstring argument");
else {
- optstr=xstrdup(argv[optind]);
+ optstr=bb_xstrdup(argv[optind]);
optind++;
}
}