diff --git a/configure.ac b/configure.ac index beb53fe6e3..447e4041a3 100644 --- a/configure.ac +++ b/configure.ac @@ -589,6 +589,10 @@ AC_CHECK_FUNCS([getline], AM_CONDITIONAL(HAVE_GETLINE, true) AC_DEFINE(HAVE_GETLINE,1,[Have getline]), AM_CONDITIONAL(HAVE_GETLINE, false)) +AC_CHECK_FUNCS([getsubopt], + AM_CONDITIONAL(HAVE_GETSUBOPT, true) + AC_DEFINE(HAVE_GETSUBOPT,1,[Have getsubopt]), + AM_CONDITIONAL(HAVE_GETSUBOPT, false)) AC_CHECK_FUNCS([fgetln], AM_CONDITIONAL(HAVE_FGETLN, true) AC_DEFINE(HAVE_FGETLN,1,[Have fgetln]), diff --git a/src/include/getsubopt.c b/src/include/getsubopt.c new file mode 100644 index 0000000000..b75497b1a4 --- /dev/null +++ b/src/include/getsubopt.c @@ -0,0 +1,89 @@ +/* + * Android c-library does not have getsubopt, + * so code lifted from uClibc + * http://git.uclibc.org/uClibc/tree/libc/unistd/getsubopt.c + */ + +/* Parse comma separate list into words. + Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + + +#include +#include + +char *strchrnul(const char *s, int c) +{ + char *result; + + result = strchr( s, c ); + + if( !result ) + { + result = (char *)s + strlen( s ); + } + + return( result ); +} + +/* Parse comma separated suboption from *OPTIONP and match against + strings in TOKENS. If found return index and set *VALUEP to + optional value introduced by an equal sign. If the suboption is + not part of TOKENS return in *VALUEP beginning of unknown + suboption. On exit *OPTIONP is set to the beginning of the next + token or at the terminating NUL character. */ +int +getsubopt (char **optionp, char *const *tokens, char **valuep) +{ + char *endp, *vstart; + int cnt; + + if (**optionp == '\0') + return -1; + + /* Find end of next token. */ + endp = strchrnul (*optionp, ','); + + /* Find start of value. */ + vstart = memchr (*optionp, '=', endp - *optionp); + if (vstart == NULL) + vstart = endp; + + /* Try to match the characters between *OPTIONP and VSTART against + one of the TOKENS. */ + for (cnt = 0; tokens[cnt] != NULL; ++cnt) + if (strncmp (*optionp, tokens[cnt], vstart - *optionp) == 0 + && tokens[cnt][vstart - *optionp] == '\0') + { + /* We found the current option in TOKENS. */ + *valuep = vstart != endp ? vstart + 1 : NULL; + + if (*endp != '\0') + *endp++ = '\0'; + *optionp = endp; + + return cnt; + } + + /* The current suboption does not match any option. */ + *valuep = *optionp; + + if (*endp != '\0') + *endp++ = '\0'; + *optionp = endp; + + return -1; +} diff --git a/src/include/getsubopt.h b/src/include/getsubopt.h new file mode 100644 index 0000000000..b4e16223f8 --- /dev/null +++ b/src/include/getsubopt.h @@ -0,0 +1,4 @@ +#ifndef _getsubopt_h +#define _getsubopt_h +int getsubopt (char **optionp, char *const *tokens, char **valuep); +#endif diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 72f1e9bf61..695308266e 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -38,6 +38,10 @@ noinst_HEADERS += ../include/getline.h endif endif +if !HAVE_GETSUBOPT +noinst_HEADERS += ../include/getsubopt.h +endif + sodir=$(libdir) # use PROGRAMS to avoid complains from automake so_PROGRAMS = liblxc.so @@ -240,6 +244,10 @@ lxc_usernsexec_SOURCES = lxc_usernsexec.c lxc_user_nic_SOURCES = lxc_user_nic.c network.c network.h lxc_checkpoint_SOURCES = lxc_checkpoint.c +if !HAVE_GETSUBOPT +lxc_copy_SOURCES += ../include/getsubopt.c ../include/getsubopt.h +endif + if HAVE_STATIC_LIBCAP sbin_PROGRAMS += init.lxc.static diff --git a/src/lxc/lxc_copy.c b/src/lxc/lxc_copy.c index 54f56f4f9d..9678b50427 100644 --- a/src/lxc/lxc_copy.c +++ b/src/lxc/lxc_copy.c @@ -17,6 +17,8 @@ */ #define _GNU_SOURCE +#include "config.h" + #include #include #include @@ -44,6 +46,10 @@ #include "utils.h" #include "bdev.h" +#ifndef HAVE_GETSUBOPT +#include <../include/getsubopt.h> +#endif + lxc_log_define(lxc_copy_ui, lxc); enum mnttype {