@@ -344,7 +344,7 @@ pub extern "C" fn strtok(s1: *mut c_char, delimiter: *const c_char) -> *mut c_ch
let token = HAYSTACK;
HAYSTACK = strpbrk(token, delimiter);
if !HAYSTACK.is_null() {
- HAYSTACK.write(0 as c_char);
+ HAYSTACK.write(0);
HAYSTACK = HAYSTACK.add(1);
} else {
HAYSTACK = ptr::null_mut();
@@ -1,2 +1,2 @@
I'd_just_like_to_interject_for_a_moment.__What_you're_referring_to_as_Linux,
-is_in_fact,_GNU/Linux,_or_as_I've_recently_taken_to_calling_it,_GNU_plus_Linux.
+is_in_fact,_GNU/Linux,_or_as_I've_recently_taken_to_calling_it,_GNU_plus_Linux.
@@ -7,8 +7,10 @@ int main(int argc, char* argv[]) {
char* token = strtok(source, " ");
while (token) {
- printf("%s_", token);
- token = strtok(NULL, " ");
+ printf("%s", token);
+ if (token = strtok(NULL, " ")) {
+ printf("_");
+ }
}
return 0;