Mercurial > gnulib
annotate lib/mbspbrk.c @ 17363:5a51fb7777a9
sys_select, sys_time: port 2013-01-30 Solaris 2.6 fix to Cygwin
Problem reported by Marco Atzeri in
<http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00000.html>.
* lib/sys_select.in.h [HAVE_SYS_SELECT_H && _CYGWIN_SYS_TIME_H]:
Simply delegate to the system <sys/select.h> in this case too.
Also, pay attention to _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H only
if OSF/1, since otherwise Cygwin breaks, and it doesn't seem to
be needed on Solaris either.
* lib/sys_time.in.h [_CYGWIN_SYS_TIME_H]:
Simply delgate to the system <sys/time.h> in this case.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 19 Mar 2013 09:08:47 -0700 |
| parents | e542fd46ad6f |
| children | 344018b6e5d7 |
| rev | line source |
|---|---|
| 8104 | 1 /* Searching a string for a character among a given set of characters. |
|
17249
e542fd46ad6f
maint: update all copyright year number ranges
Eric Blake <eblake@redhat.com>
parents:
16201
diff
changeset
|
2 Copyright (C) 1999, 2002, 2006-2013 Free Software Foundation, Inc. |
| 8104 | 3 Written by Bruno Haible <bruno@clisp.org>, 2007. |
| 4 | |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8140
diff
changeset
|
5 This program is free software: you can redistribute it and/or modify |
| 8104 | 6 it under the terms of the GNU General Public License as published by |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8140
diff
changeset
|
7 the Free Software Foundation; either version 3 of the License, or |
|
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8140
diff
changeset
|
8 (at your option) any later version. |
| 8104 | 9 |
| 10 This program is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 GNU General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
8140
diff
changeset
|
16 along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
| 8104 | 17 |
| 18 #include <config.h> | |
| 19 | |
| 20 /* Specification. */ | |
| 21 #include <string.h> | |
| 22 | |
|
10954
a0bbe1a6f787
Remove HAVE_MBRTOWC conditionals. Use mbrtowc unconditionally.
Bruno Haible <bruno@clisp.org>
parents:
9309
diff
changeset
|
23 #include "mbuiter.h" |
| 8104 | 24 |
| 25 /* Find the first occurrence in the character string STRING of any character | |
| 26 in the character string ACCEPT. Return the pointer to it, or NULL if none | |
| 27 exists. */ | |
| 28 char * | |
| 29 mbspbrk (const char *string, const char *accept) | |
| 30 { | |
| 31 /* Optimize two cases. */ | |
| 32 if (accept[0] == '\0') | |
| 33 return NULL; | |
| 34 if (accept[1] == '\0') | |
| 35 return mbschr (string, accept[0]); | |
| 36 /* General case. */ | |
| 37 if (MB_CUR_MAX > 1) | |
| 38 { | |
| 39 mbui_iterator_t iter; | |
| 40 | |
| 41 for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter)) | |
|
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
42 { |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
43 if (mb_len (mbui_cur (iter)) == 1) |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
44 { |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
45 if (mbschr (accept, * mbui_cur_ptr (iter))) |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
46 return (char *) mbui_cur_ptr (iter); |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
47 } |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
48 else |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
49 { |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
50 mbui_iterator_t aiter; |
| 8104 | 51 |
|
12421
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
52 for (mbui_init (aiter, accept); |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
53 mbui_avail (aiter); |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
54 mbui_advance (aiter)) |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
55 if (mb_equal (mbui_cur (aiter), mbui_cur (iter))) |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
56 return (char *) mbui_cur_ptr (iter); |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
57 } |
|
e8d2c6fc33ad
Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents:
10954
diff
changeset
|
58 } |
| 8104 | 59 return NULL; |
| 60 } | |
| 61 else | |
| 62 return strpbrk (string, accept); | |
| 63 } |