From 8141b62d5ee580441c05ce569862c16651f94aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 14 Sep 2004 20:44:59 +0000 Subject: [PATCH] Removed our old getopt.c - we're now using the one from glibc. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8947 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/posix/unistd/Jamfile | 1 - src/kernel/libroot/posix/unistd/getopt.c | 125 ----------------------- 2 files changed, 126 deletions(-) delete mode 100644 src/kernel/libroot/posix/unistd/getopt.c diff --git a/src/kernel/libroot/posix/unistd/Jamfile b/src/kernel/libroot/posix/unistd/Jamfile index 636d126078..d6f268cdea 100644 --- a/src/kernel/libroot/posix/unistd/Jamfile +++ b/src/kernel/libroot/posix/unistd/Jamfile @@ -12,7 +12,6 @@ KernelMergeObject posix_unistd.o : _exit.c fcntl.c fork.c - getopt.c hostname.c ioctl.c link.c diff --git a/src/kernel/libroot/posix/unistd/getopt.c b/src/kernel/libroot/posix/unistd/getopt.c deleted file mode 100644 index cd0c45a777..0000000000 --- a/src/kernel/libroot/posix/unistd/getopt.c +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 1987, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - - -#include -#include -#include -#include - - -/* required global variables */ -int opterr = 1; /* if error message should be printed */ -int optind = 1; /* index into parent argv vector */ -int optopt = 0; /* character checked for validity */ -int optreset = 0; /* reset getopt */ -char *optarg = NULL; /* argument associated with option */ - -#define BADCH (int)'?' -#define BADARG (int)':' -#define EMSG "" - - -/** getopt -- Parse argc/argv argument vector. - */ - -int -getopt(int argc, char * const *argv, const char *optionString) -{ - extern char *__progname; - static char *place = EMSG; /* option letter processing */ - char *oli; /* option letter list index */ - - if (optreset || !*place) { - /* update scanning pointer */ - optreset = 0; - if (optind >= argc || *(place = argv[optind]) != '-') { - place = EMSG; - return -1; - } - if (place[1] && *++place == '-') { - /* found "--" */ - ++optind; - place = EMSG; - return -1; - } - } - - /* option letter okay? */ - - if ((optopt = (int)*place++) == (int)':' || !(oli = strchr(optionString, optopt))) { - /* - * if the user didn't specify '-' as an option, - * assume it means -1. - */ - if (optopt == (int)'-') - return (-1); - if (!*place) - ++optind; - if (opterr && optionString[0] != ':') - fprintf(stderr, "%s: illegal option -- %c\n", __progname, optopt); - - return BADCH; - } - - if (*++oli != ':') { - /* don't need argument */ - optarg = NULL; - if (!*place) - ++optind; - } else { - /* need an argument */ - if (*place) { - /* no white space */ - optarg = place; - } else if (argc <= ++optind) { - /* no arg */ - place = EMSG; - if (optionString[0] == ':') - return BADARG; - - if (opterr) - fprintf(stderr, "%s: option requires an argument -- %c\n", __progname, optopt); - - return BADCH; - } else { - /* white space */ - optarg = argv[optind]; - } - place = EMSG; - ++optind; - } - - /* dump back option letter */ - return optopt; -}