Navigation

Changeset 1009

Timestamp:

04/23/08 07:13:49 (13 years ago)

Author:

ppalmers

Message:

fiddle around with the argument parsing to ease the reuse by other firmware loaders

Files:

r962	r1009
60	60	// arg parsing
61	61	argp_parse (argp, argc, argv, 0, 0, args);
	62
	63	if (args->nargs < 2) {
	64	printDeviceList();
	65	exit(0);
	66	}
62	67
63	68	errno = 0;

r962	r1009
37	37	DECLARE_GLOBAL_DEBUG_MODULE;
38	38
39		static char args_doc[] = "~~GUID OPERATION~~";
	39	static char args_doc[] = "OPERATION [ARGUMENTS]";
40	40	static struct argp _argp = { options, parse_opt, args_doc, doc };
41	41	struct argp* argp = &_argp;
…	…
70	70	}
71	71	break;
	72	case 'g':
	73	errno = 0;
	74	arguments->guid = strtoll(arg, &tail, 0);
	75	if (errno) {
	76	debugError("argument parsing failed: %s\n",
	77	strerror(errno));
	78	return errno;
	79	}
	80	break;
72	81	case 'f':
73	82	arguments->force = 1;
…	…
77	86	break;
78	87	case ARGP_KEY_ARG:
79		if (state->arg_num >= 3) {
	88	if (state->arg_num >= MAX_NB_ARGS) {
80	89	// Too many arguments.
81	90	argp_usage (state);
82	91	}
	92
83	93	arguments->args[state->arg_num] = arg;
	94	arguments->nargs = state->arg_num;
84	95	break;
85	96	case ARGP_KEY_END:
86		if (state->arg_num < 2) {
87		printDeviceList();
88		exit(0);
89		}
	97	arguments->nargs = state->arg_num;
90	98	break;
91	99	default:
…	…
99	107	{
100	108	Ieee1394Service service;
	109	// switch off all messages since they mess up the list
	110	service.setVerboseLevel(0);
101	111	if ( !service.initialize( args->port ) ) {
102	112	cerr << "Could not initialize IEEE 1394 service" << endl;