Getopt'ed by Marc Nijdam <marc_nijdam@hp.com>

-Erik
author: Eric Andersen <andersen@codepoet.org> 2000-07-14 18:39:08 +0000
committer: Eric Andersen <andersen@codepoet.org> 2000-07-14 18:39:08 +0000
commit: add09fd558c8a336554fbf8b381ab0f8e180382a (patch)
tree: 2ccbcd48f335161c647be3f2c296cae06aceb671 /coreutils
parent: 17ad45aace3141d1b997208a43979495ead98f7c (diff)
download: busybox-w32-add09fd558c8a336554fbf8b381ab0f8e180382a.tar.gz
busybox-w32-add09fd558c8a336554fbf8b381ab0f8e180382a.tar.bz2
busybox-w32-add09fd558c8a336554fbf8b381ab0f8e180382a.zip
2 files changed, 43 insertions, 52 deletions
diff --git a/coreutils/date.c b/coreutils/date.c
index bc6d13137..3ede1237c 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -159,7 +159,7 @@ int date_main(int argc, char **argv)
        char *date_str = NULL;
        char *date_fmt = NULL;
        char *t_buff;
-        int i;
+        char c;
        int set_time = 0;
        int rfc822 = 0;
        int utc = 0;
@@ -168,49 +168,39 @@ int date_main(int argc, char **argv)
        struct tm tm_time;
        /* Interpret command line args */
-        i = --argc;
+        while ((c = getopt(argc, argv, "Rs:ud:")) != EOF) {
-        argv++;
+                switch (c) {
-        while (i > 0 && **argv) {
+                case 'R':
-                if (**argv == '-') {
+                        rfc822 = 1;
-                        while (i > 0 && *++(*argv))
+                        break;
-                                switch (**argv) {
+                case 's':
-                                case 'R':
+                        set_time = 1;
-                                        rfc822 = 1;
+                        if ((date_str != NULL) || ((date_str = optarg) == NULL))
-                                        break;
-                                case 's':
-                                        set_time = 1;
-                                        if (date_str != NULL)
-                                                usage(date_usage);
-                                        date_str = *argv;
-                                        break;
-                                case 'u':
-                                        utc = 1;
-                                        if (putenv("TZ=UTC0") != 0) 
-                                                fatalError(memory_exhausted);
-                                        break;
-                                case 'd':
-                                        use_arg = 1;
-                                        if (date_str != NULL)
-                                                usage(date_usage);
-                                        date_str = *argv;
-                                        break;
-                                case '-':
-                                        usage(date_usage);
-                                }
-                } else {
-                        if ((date_fmt == NULL) && (**argv == '+'))
-                                date_fmt = *argv + 1;   /* Skip over the '+' */
-                        else if (date_str == NULL) {
-                                set_time = 1;
-                                date_str = *argv;
-                        } else {
                                usage(date_usage);
-                        }
+                        break;
+                case 'u':
+                        utc = 1;
+                        if (putenv("TZ=UTC0") != 0) 
+                                fatalError(memory_exhausted);
+                        break;
+                case 'd':
+                        use_arg = 1;
+                        if ((date_str != NULL) || ((date_str = optarg) == NULL))
+                                usage(date_usage);
+                        break;
+                default:
+                        usage(date_usage);
                }
-                i--;
-                argv++;
        }
+        if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+'))
+                date_fmt = &argv[optind][1];   /* Skip over the '+' */
+        else if (date_str == NULL) {
+                set_time = 1;
+                date_str = argv[optind];
+        } else {
+                usage(date_usage);
+        }
        /* Now we have parsed all the information except the date format
           which depends on whether the clock is being set or read */
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 6e279d1c6..387ea3fef 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -45,23 +45,24 @@ echo_main(int argc, char** argv)
        int nflag = 0;
        int eflag = 0;
-        ap = argv;
-        if (argc)
+        while ((c = getopt(argc, argv, "neE")) != EOF) {
-                ap++;
+                switch (c) {
-        while ((p = *ap) != NULL && *p == '-') {
+                case 'n': 
-                if (strcmp(p, "-n")==0) {
                        nflag = 1;
-                } else if (strcmp(p, "-e")==0) {
+                        break;
+                case 'e':
                        eflag = 1;
-                } else if (strcmp(p, "-E")==0) {
+                        break;
+                case 'E':
                        eflag = 0;
+                        break;
+                default: 
+                        usage(uname_usage);
                }
-                else if (strncmp(p, "--", 2)==0) {
-                        usage( uname_usage);
-                } 
-                else break;
-                ap++;
        }
+        ap = &argv[optind];
        while ((p = *ap++) != NULL) {
                while ((c = *p++) != '\0') {
                        if (c == '\\' && eflag) {
author	Eric Andersen <andersen@codepoet.org>	2000-07-14 18:39:08 +0000
committer	Eric Andersen <andersen@codepoet.org>	2000-07-14 18:39:08 +0000
commit	add09fd558c8a336554fbf8b381ab0f8e180382a (patch)
tree	2ccbcd48f335161c647be3f2c296cae06aceb671 /coreutils
parent	17ad45aace3141d1b997208a43979495ead98f7c (diff)
download	busybox-w32-add09fd558c8a336554fbf8b381ab0f8e180382a.tar.gz busybox-w32-add09fd558c8a336554fbf8b381ab0f8e180382a.tar.bz2 busybox-w32-add09fd558c8a336554fbf8b381ab0f8e180382a.zip

diff --git a/coreutils/date.c b/coreutils/date.c index bc6d13137..3ede1237c 100644 --- a/coreutils/date.c +++ b/coreutils/date.c
@@ -159,7 +159,7 @@ int date_main(int argc, char **argv)
159	char *date_str = NULL;	159	char *date_str = NULL;
160	char *date_fmt = NULL;	160	char *date_fmt = NULL;
161	char *t_buff;	161	char *t_buff;
162	int i;	162	char c;
163	int set_time = 0;	163	int set_time = 0;
164	int rfc822 = 0;	164	int rfc822 = 0;
165	int utc = 0;	165	int utc = 0;
@@ -168,49 +168,39 @@ int date_main(int argc, char **argv)
168	struct tm tm_time;	168	struct tm tm_time;
169		169
170	/* Interpret command line args */	170	/* Interpret command line args */
171	i = --argc;	171	while ((c = getopt(argc, argv, "Rs:ud:")) != EOF) {
172	argv++;	172	switch (c) {
173	while (i > 0 && **argv) {	173	case 'R':
174	if (**argv == '-') {	174	rfc822 = 1;
175	while (i > 0 && ++(argv))	175	break;
176	switch (**argv) {	176	case 's':
177	case 'R':	177	set_time = 1;
178	rfc822 = 1;	178	if ((date_str != NULL) \|\| ((date_str = optarg) == NULL))
179	break;
180	case 's':
181	set_time = 1;
182	if (date_str != NULL)
183	usage(date_usage);
184	date_str = *argv;
185	break;
186	case 'u':
187	utc = 1;
188	if (putenv("TZ=UTC0") != 0)
189	fatalError(memory_exhausted);
190	break;
191	case 'd':
192	use_arg = 1;
193	if (date_str != NULL)
194	usage(date_usage);
195	date_str = *argv;
196	break;
197	case '-':
198	usage(date_usage);
199	}
200	} else {
201	if ((date_fmt == NULL) && (**argv == '+'))
202	date_fmt = argv + 1; / Skip over the '+' */
203	else if (date_str == NULL) {
204	set_time = 1;
205	date_str = *argv;
206	} else {
207	usage(date_usage);	179	usage(date_usage);
208	}	180	break;
		181	case 'u':
		182	utc = 1;
		183	if (putenv("TZ=UTC0") != 0)
		184	fatalError(memory_exhausted);
		185	break;
		186	case 'd':
		187	use_arg = 1;
		188	if ((date_str != NULL) \|\| ((date_str = optarg) == NULL))
		189	usage(date_usage);
		190	break;
		191	default:
		192	usage(date_usage);
209	}	193	}
210	i--;
211	argv++;
212	}	194	}
213		195
		196	if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+'))
		197	date_fmt = &argv[optind][1]; /* Skip over the '+' */
		198	else if (date_str == NULL) {
		199	set_time = 1;
		200	date_str = argv[optind];
		201	} else {
		202	usage(date_usage);
		203	}
214		204
215	/* Now we have parsed all the information except the date format	205	/* Now we have parsed all the information except the date format
216	which depends on whether the clock is being set or read */	206	which depends on whether the clock is being set or read */


diff --git a/coreutils/echo.c b/coreutils/echo.c index 6e279d1c6..387ea3fef 100644 --- a/coreutils/echo.c +++ b/coreutils/echo.c
@@ -45,23 +45,24 @@ echo_main(int argc, char** argv)
45	int nflag = 0;	45	int nflag = 0;
46	int eflag = 0;	46	int eflag = 0;
47		47
48	ap = argv;	48
49	if (argc)	49	while ((c = getopt(argc, argv, "neE")) != EOF) {
50	ap++;	50	switch (c) {
51	while ((p = ap) != NULL && p == '-') {	51	case 'n':
52	if (strcmp(p, "-n")==0) {
53	nflag = 1;	52	nflag = 1;
54	} else if (strcmp(p, "-e")==0) {	53	break;
		54	case 'e':
55	eflag = 1;	55	eflag = 1;
56	} else if (strcmp(p, "-E")==0) {	56	break;
		57	case 'E':
57	eflag = 0;	58	eflag = 0;
		59	break;
		60	default:
		61	usage(uname_usage);
58	}	62	}
59	else if (strncmp(p, "--", 2)==0) {
60	usage( uname_usage);
61	}
62	else break;
63	ap++;
64	}	63	}
		64
		65	ap = &argv[optind];
65	while ((p = *ap++) != NULL) {	66	while ((p = *ap++) != NULL) {
66	while ((c = *p++) != '\0') {	67	while ((c = *p++) != '\0') {
67	if (c == '\\' && eflag) {	68	if (c == '\\' && eflag) {