Index: uspace/lib/posix/Makefile =================================================================== --- uspace/lib/posix/Makefile (revision b4d625240d3c62c679c3e4318d1077684642e2f1) +++ uspace/lib/posix/Makefile (revision dddc3d9a284915ba47db462a4d5b7fdcb2748f67) @@ -40,5 +40,5 @@ SOURCES = \ ctype.c \ - getopt.c \ + fcntl.c \ stdio.c \ stdlib.c \ Index: uspace/lib/posix/fnmatch.c =================================================================== --- uspace/lib/posix/fnmatch.c (revision b4d625240d3c62c679c3e4318d1077684642e2f1) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup libposix - * @{ - */ -/** @file - */ - -#define LIBPOSIX_INTERNAL - -#include "internal/common.h" -#include "fnmatch.h" - -/** - * - * @param pattern - * @param string - * @param flags - * @return - */ -int posix_fnmatch(const char *pattern, const char *string, int flags) -{ - // TODO - not_implemented(); -} - -/** @} - */ Index: uspace/lib/posix/fnmatch.h =================================================================== --- uspace/lib/posix/fnmatch.h (revision b4d625240d3c62c679c3e4318d1077684642e2f1) +++ (revision ) @@ -1,61 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup libposix - * @{ - */ -/** @file - */ - -#ifndef POSIX_FNMATCH_H_ -#define POSIX_FNMATCH_H_ - -/* fnmatch flags */ -#undef FNM_PATHNAME -#undef FNM_NOESCAPE -#undef FNM_PERIOD -#define FNM_PATHNAME (1 << 0) /* Slash cannot be matched to the wildcard. */ -#define FNM_NOESCAPE (1 << 1) /* Disable backslash escaping. */ -#define FNM_PERIOD (1 << 2) /* Leading period must be exactly matched. */ - -/* fnmatch return values */ -#undef FNM_NOMATCH -#undef FNM_NOSYS -#define FNM_NOMATCH 1 /* The string does not match the pattern. */ -#define FNM_NOSYS (-1) /* In case fnmatch is not supported. */ - -extern int posix_fnmatch(const char *pattern, const char *string, int flags); - -#ifndef LIBPOSIX_INTERNAL - #define fnmatch posix_fnmatch -#endif - -#endif /* POSIX_FNMATCH_H_ */ - -/** @} - */ Index: uspace/lib/posix/getopt.c =================================================================== --- uspace/lib/posix/getopt.c (revision b4d625240d3c62c679c3e4318d1077684642e2f1) +++ (revision ) @@ -1,73 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup libposix - * @{ - */ -/** @file - */ - -#define LIBPOSIX_INTERNAL - -#include "internal/common.h" -#include "getopt.h" - -/** - * - * @param argc - * @param argv - * @param optstring - * @param longopts - * @param longindex - * @return - */ -int posix_getopt_long(int argc, char * const argv[], - const char *optstring, const struct posix_option *longopts, int *longindex) -{ - // TODO - not_implemented(); -} - -/** - * - * @param argc - * @param argv - * @param optstring - * @param longopts - * @param longindex - * @return - */ -int posix_getopt_long_only(int argc, char * const argv[], - const char *optstring, const struct posix_option *longopts, int *longindex) -{ - // TODO - not_implemented(); -} - -/** @} - */ Index: uspace/lib/posix/getopt.h =================================================================== --- uspace/lib/posix/getopt.h (revision b4d625240d3c62c679c3e4318d1077684642e2f1) +++ (revision ) @@ -1,67 +1,0 @@ -/* - * Copyright (c) 2011 Petr Koupy - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup libposix - * @{ - */ -/** @file - */ - -#ifndef POSIX_GETOPT_H_ -#define POSIX_GETOPT_H_ - -#undef no_argument -#undef required_argument -#undef optional_argument -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -struct posix_option { - const char *name; /* name of the option */ - int has_arg; /* no_argument / required_argument / optional_argument */ - int *flag; /* TODO */ - int val; /* TODO */ -}; - -extern int posix_getopt_long(int argc, char * const argv[], - const char *optstring, const struct posix_option *longopts, int *longindex); - -extern int posix_getopt_long_only(int argc, char * const argv[], - const char *optstring, const struct posix_option *longopts, int *longindex); - -#ifndef LIBPOSIX_INTERNAL - #define option posix_option - #define posix_getopt_long posix_getopt_long - #define getopt_long_only posix_getopt_long_only -#endif - -#endif /* POSIX_GETOPT_H_ */ - -/** @} - */ Index: uspace/lib/posix/string.h =================================================================== --- uspace/lib/posix/string.h (revision b4d625240d3c62c679c3e4318d1077684642e2f1) +++ uspace/lib/posix/string.h (revision dddc3d9a284915ba47db462a4d5b7fdcb2748f67) @@ -133,5 +133,4 @@ #define strerror posix_strerror #define strerror_r posix_strerror_r - #define strsignal(i) ((char *) "SIGNonSense: There are no signals in HelenOS.") #define strlen posix_strlen