Deleted Added
sdiff udiff text old ( 92986 ) new ( 93399 )
full compact
getopt.c (92986) getopt.c (93399)
1/*
2 * Copyright (c) 1987, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 21 unchanged lines hidden (view full) ---

30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
36#endif /* LIBC_SCCS and not lint */
37#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1987, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 21 unchanged lines hidden (view full) ---

30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
36#endif /* LIBC_SCCS and not lint */
37#include <sys/cdefs.h>
38__FBSDID("$FreeBSD: head/lib/libc/stdlib/getopt.c 92986 2002-03-22 21:53:29Z obrien $");
38__FBSDID("$FreeBSD: head/lib/libc/stdlib/getopt.c 93399 2002-03-29 22:43:43Z markm $");
39
39
40#include "namespace.h"
40#include <stdio.h>
41#include <stdlib.h>
42#include <string.h>
41#include <stdio.h>
42#include <stdlib.h>
43#include <string.h>
44#include "un-namespace.h"
43
45
46#include "libc_private.h"
47
44int opterr = 1, /* if error message should be printed */
45 optind = 1, /* index into parent argv vector */
46 optopt, /* character checked for validity */
47 optreset; /* reset getopt */
48char *optarg; /* argument associated with option */
49
50#define BADCH (int)'?'
51#define BADARG (int)':'

--- 4 unchanged lines hidden (view full) ---

56 * Parse argc/argv argument vector.
57 */
58int
59getopt(nargc, nargv, ostr)
60 int nargc;
61 char * const *nargv;
62 const char *ostr;
63{
48int opterr = 1, /* if error message should be printed */
49 optind = 1, /* index into parent argv vector */
50 optopt, /* character checked for validity */
51 optreset; /* reset getopt */
52char *optarg; /* argument associated with option */
53
54#define BADCH (int)'?'
55#define BADARG (int)':'

--- 4 unchanged lines hidden (view full) ---

60 * Parse argc/argv argument vector.
61 */
62int
63getopt(nargc, nargv, ostr)
64 int nargc;
65 char * const *nargv;
66 const char *ostr;
67{
64 extern char *__progname;
65 static char *place = EMSG; /* option letter processing */
66 char *oli; /* option letter list index */
67
68 if (optreset || !*place) { /* update scanning pointer */
69 optreset = 0;
70 if (optind >= nargc || *(place = nargv[optind]) != '-') {
71 place = EMSG;
72 return (-1);

--- 10 unchanged lines hidden (view full) ---

83 * if the user didn't specify '-' as an option,
84 * assume it means -1.
85 */
86 if (optopt == (int)'-')
87 return (-1);
88 if (!*place)
89 ++optind;
90 if (opterr && *ostr != ':' && optopt != BADCH)
68 static char *place = EMSG; /* option letter processing */
69 char *oli; /* option letter list index */
70
71 if (optreset || !*place) { /* update scanning pointer */
72 optreset = 0;
73 if (optind >= nargc || *(place = nargv[optind]) != '-') {
74 place = EMSG;
75 return (-1);

--- 10 unchanged lines hidden (view full) ---

86 * if the user didn't specify '-' as an option,
87 * assume it means -1.
88 */
89 if (optopt == (int)'-')
90 return (-1);
91 if (!*place)
92 ++optind;
93 if (opterr && *ostr != ':' && optopt != BADCH)
91 (void)fprintf(stderr,
92 "%s: illegal option -- %c\n", __progname, optopt);
94 (void)fprintf(stderr, "%s: illegal option -- %c\n",
95 _getprogname(), optopt);
93 return (BADCH);
94 }
95 if (*++oli != ':') { /* don't need argument */
96 optarg = NULL;
97 if (!*place)
98 ++optind;
99 }
100 else { /* need an argument */
101 if (*place) /* no white space */
102 optarg = place;
103 else if (nargc <= ++optind) { /* no arg */
104 place = EMSG;
105 if (*ostr == ':')
106 return (BADARG);
107 if (opterr)
108 (void)fprintf(stderr,
109 "%s: option requires an argument -- %c\n",
96 return (BADCH);
97 }
98 if (*++oli != ':') { /* don't need argument */
99 optarg = NULL;
100 if (!*place)
101 ++optind;
102 }
103 else { /* need an argument */
104 if (*place) /* no white space */
105 optarg = place;
106 else if (nargc <= ++optind) { /* no arg */
107 place = EMSG;
108 if (*ostr == ':')
109 return (BADARG);
110 if (opterr)
111 (void)fprintf(stderr,
112 "%s: option requires an argument -- %c\n",
110 __progname, optopt);
113 _getprogname(), optopt);
111 return (BADCH);
112 }
113 else /* white space */
114 optarg = nargv[optind];
115 place = EMSG;
116 ++optind;
117 }
118 return (optopt); /* dump back option letter */
119}
114 return (BADCH);
115 }
116 else /* white space */
117 optarg = nargv[optind];
118 place = EMSG;
119 ++optind;
120 }
121 return (optopt); /* dump back option letter */
122}