Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | #include "plstr.h" |
michael@0 | 7 | |
michael@0 | 8 | PR_IMPLEMENT(char *) |
michael@0 | 9 | PL_strtok_r(char *s1, const char *s2, char **lasts) |
michael@0 | 10 | { |
michael@0 | 11 | const char *sepp; |
michael@0 | 12 | int c, sc; |
michael@0 | 13 | char *tok; |
michael@0 | 14 | |
michael@0 | 15 | if( s1 == NULL ) |
michael@0 | 16 | { |
michael@0 | 17 | if( *lasts == NULL ) |
michael@0 | 18 | return NULL; |
michael@0 | 19 | |
michael@0 | 20 | s1 = *lasts; |
michael@0 | 21 | } |
michael@0 | 22 | |
michael@0 | 23 | for( ; (c = *s1) != 0; s1++ ) |
michael@0 | 24 | { |
michael@0 | 25 | for( sepp = s2 ; (sc = *sepp) != 0 ; sepp++ ) |
michael@0 | 26 | { |
michael@0 | 27 | if( c == sc ) |
michael@0 | 28 | break; |
michael@0 | 29 | } |
michael@0 | 30 | if( sc == 0 ) |
michael@0 | 31 | break; |
michael@0 | 32 | } |
michael@0 | 33 | |
michael@0 | 34 | if( c == 0 ) |
michael@0 | 35 | { |
michael@0 | 36 | *lasts = NULL; |
michael@0 | 37 | return NULL; |
michael@0 | 38 | } |
michael@0 | 39 | |
michael@0 | 40 | tok = s1++; |
michael@0 | 41 | |
michael@0 | 42 | for( ; (c = *s1) != 0; s1++ ) |
michael@0 | 43 | { |
michael@0 | 44 | for( sepp = s2; (sc = *sepp) != 0; sepp++ ) |
michael@0 | 45 | { |
michael@0 | 46 | if( c == sc ) |
michael@0 | 47 | { |
michael@0 | 48 | *s1++ = '\0'; |
michael@0 | 49 | *lasts = s1; |
michael@0 | 50 | return tok; |
michael@0 | 51 | } |
michael@0 | 52 | } |
michael@0 | 53 | } |
michael@0 | 54 | *lasts = NULL; |
michael@0 | 55 | return tok; |
michael@0 | 56 | } |