use the right tool for the job. getopt clearly isnt

pull/3/head
rofl0r 2012-01-26 05:11:52 +01:00
parent 75bd465038
commit 75d41dea3d
1 changed files with 15 additions and 18 deletions

View File

@ -26,9 +26,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
extern char *optarg;
extern int optind, opterr, optopt;
#include "common.h" #include "common.h"
static int usage(char** argv) { static int usage(char** argv) {
@ -74,31 +71,33 @@ int main(int argc, char *argv[]) {
char *path = NULL; char *path = NULL;
char buf[256]; char buf[256];
char pbuf[256]; char pbuf[256];
int opt;
int start_argv = 1; int start_argv = 1;
int quiet = 0; int quiet = 0;
size_t i;
const char* prefix = NULL;
if(argc == 1) return usage(argv); for(i = 0; i < 2; i++) {
if(start_argv < argc && argv[start_argv][0] == '-') {
while ((opt = getopt(argc, argv, "qf:")) != -1) { if(argv[start_argv][1] == 'q') {
switch (opt) {
case 'q':
quiet = 1; quiet = 1;
start_argv++; start_argv++;
break; } else if(argv[start_argv][1] == 'f') {
case 'f':
path = (char *)optarg; if(start_argv + 1 < argc)
path = argv[start_argv + 1];
else
return usage(argv);
if(!path) { if(!path) {
fprintf(stderr, "error: no path supplied.\n"); fprintf(stderr, "error: no path supplied.\n");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
start_argv += 2; start_argv += 2;
break;
default: /* '?' */
return usage(argv);
} }
} else
break;
} }
if(start_argv >= argc) return usage(argv); if(start_argv >= argc) return usage(argv);
/* check if path of config file has not been passed via command line */ /* check if path of config file has not been passed via command line */
@ -137,8 +136,6 @@ int main(int argc, char *argv[]) {
// search DLL // search DLL
size_t i = 0;
const char* prefix = NULL;
set_own_dir(argv[0]); set_own_dir(argv[0]);