Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Start using acc_getopt.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2010-08-05 15:08:06 +02:00
parent 99b4921309
commit 6d8e1fe776
4 changed files with 26 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+25 -11
View File
@@ -27,7 +27,6 @@
#include "conf.h"
#include "mygetopt.h"
#include "file.h"
#include "packer.h"
#include "p_elf.h"
@@ -90,6 +89,19 @@ static int done_script_name = 0;
const char *argv0 = "";
const char *progname = "";
static acc_getopt_t mfx_getopt;
#define mfx_optarg mfx_getopt.optarg
#define mfx_optind mfx_getopt.optind
#define mfx_option acc_getopt_longopt_t
static void handle_opterr(acc_getopt_p g, const char *f, void *v)
{
struct A { va_list ap; };
struct A *a = (struct A *) v;
fprintf( stderr, "%s: ", g->progname);
vfprintf(stderr, f, a->ap);
fprintf( stderr, "\n");
}
static int num_files = -1;
static int exit_code = EXIT_OK;
@@ -1061,13 +1073,14 @@ static const struct mfx_option longopts[] =
};
int optc, longind;
char buf[256];
char shortopts[256];
prepare_shortopts(buf,"123456789hH?V",longopts),
mfx_optind = 0;
mfx_opterr = 1;
prepare_shortopts(shortopts, "123456789hH?V", longopts),
acc_getopt_init(&mfx_getopt, 1, argc, argv);
mfx_getopt.progname = progname;
mfx_getopt.opterr = handle_opterr;
opt->o_unix.osabi0 = Elf32_Ehdr::ELFOSABI_LINUX;
while ((optc = mfx_getopt_long(argc, argv, buf, longopts, &longind)) >= 0)
while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, &longind)) >= 0)
{
if (do_option(optc, argv[mfx_optind-1]) != 0)
e_usage();
@@ -1153,7 +1166,7 @@ static const struct mfx_option longopts[] =
int targc;
char **targv = NULL;
static const char sep[] = " \t";
char buf[256];
char shortopts[256];
var = getenv(OPTIONS_VAR);
if (var == NULL || !var[0])
@@ -1209,10 +1222,11 @@ static const struct mfx_option longopts[] =
e_envopt(targv[i]);
/* handle options */
prepare_shortopts(buf,"123456789",longopts);
mfx_optind = 0;
mfx_opterr = 1;
while ((optc = mfx_getopt_long(targc, targv, buf, longopts, &longind)) >= 0)
prepare_shortopts(shortopts, "123456789", longopts);
acc_getopt_init(&mfx_getopt, 1, targc, targv);
mfx_getopt.progname = progname;
mfx_getopt.opterr = handle_opterr;
while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, &longind)) >= 0)
{
if (do_option(optc, targv[mfx_optind-1]) != 0)
e_envopt(NULL);