Wed, 08 Feb 2012 23:43:02 +0100
changed make clean + added dlist_clone with copy test + added va_end statements to string.c
olaf@20 | 1 | /* |
olaf@20 | 2 | * File: sstring.c |
olaf@20 | 3 | * Author: olaf |
olaf@20 | 4 | * |
olaf@20 | 5 | * Created on 17. Juni 2010, 13:27 |
olaf@20 | 6 | */ |
olaf@20 | 7 | |
olaf@20 | 8 | #include <stdlib.h> |
olaf@20 | 9 | #include <string.h> |
olaf@20 | 10 | #include <stdarg.h> |
olaf@20 | 11 | |
olaf@20 | 12 | #include "string.h" |
olaf@20 | 13 | |
olaf@20 | 14 | sstr_t sstr (char *s) { |
olaf@20 | 15 | sstr_t string; |
olaf@20 | 16 | string.ptr = s; |
olaf@20 | 17 | string.length = strlen(s); |
olaf@20 | 18 | return string; |
olaf@20 | 19 | } |
olaf@20 | 20 | |
olaf@20 | 21 | sstr_t sstrn (char *s, size_t n) { |
olaf@20 | 22 | sstr_t string; |
olaf@20 | 23 | string.ptr = s; |
olaf@20 | 24 | string.length = n; |
olaf@20 | 25 | return string; |
olaf@20 | 26 | } |
olaf@20 | 27 | |
olaf@20 | 28 | size_t sstrnlen (size_t n, sstr_t s, ...) { |
olaf@20 | 29 | va_list ap; |
olaf@20 | 30 | size_t size = s.length; |
olaf@20 | 31 | va_start(ap, s); |
olaf@20 | 32 | |
olaf@20 | 33 | for (int i=0;i<n-1;i++) { |
olaf@20 | 34 | sstr_t str = va_arg(ap, sstr_t); |
olaf@20 | 35 | size += str.length; |
olaf@20 | 36 | } |
universe@24 | 37 | va_end(ap); |
olaf@20 | 38 | |
olaf@20 | 39 | return size; |
olaf@20 | 40 | } |
olaf@20 | 41 | |
olaf@20 | 42 | sstr_t sstrcat (sstr_t s, ...) { |
olaf@20 | 43 | va_list ap; |
olaf@20 | 44 | va_start(ap, s); |
olaf@20 | 45 | s.ptr[0] = 0; |
olaf@20 | 46 | |
olaf@20 | 47 | sstr_t str = va_arg (ap, sstr_t); |
olaf@20 | 48 | while (str.ptr != NULL) { |
olaf@20 | 49 | s.ptr = strncat (s.ptr, str.ptr, s.length); |
olaf@20 | 50 | str = va_arg (ap, sstr_t); |
olaf@20 | 51 | } |
universe@24 | 52 | va_end(ap); |
olaf@20 | 53 | |
olaf@20 | 54 | return s; |
olaf@20 | 55 | } |
olaf@20 | 56 | |
olaf@20 | 57 | sstr_t sstrncat (size_t n, sstr_t s, sstr_t c1, ...) { |
olaf@20 | 58 | va_list ap; |
olaf@20 | 59 | va_start(ap, c1); |
olaf@20 | 60 | s.ptr[0] = 0; |
olaf@20 | 61 | |
olaf@20 | 62 | s.ptr = strncat (s.ptr, c1.ptr, s.length); |
olaf@20 | 63 | for (int i=0;i<n-1;i++) { |
olaf@20 | 64 | sstr_t str = va_arg (ap, sstr_t); |
olaf@20 | 65 | s.ptr = strncat (s.ptr, str.ptr, s.length); |
olaf@20 | 66 | } |
universe@24 | 67 | va_end(ap); |
olaf@20 | 68 | |
olaf@20 | 69 | return s; |
olaf@20 | 70 | } |
olaf@20 | 71 | |
olaf@20 | 72 | sstr_t sstrsubs (sstr_t s, size_t start) { |
olaf@20 | 73 | return sstrsubsl (s, start, s.length-start); |
olaf@20 | 74 | } |
olaf@20 | 75 | |
olaf@20 | 76 | sstr_t sstrsubsl (sstr_t s, size_t start, size_t length) { |
olaf@20 | 77 | sstr_t new_sstr; |
olaf@20 | 78 | if (start < 0 || start >= s.length || length < 0) { |
olaf@20 | 79 | return s; |
olaf@20 | 80 | } |
olaf@20 | 81 | if (length > s.length-start) { |
olaf@20 | 82 | length = s.length-start; |
olaf@20 | 83 | } |
olaf@20 | 84 | new_sstr.ptr = &s.ptr[start]; |
olaf@20 | 85 | new_sstr.length = length; |
olaf@20 | 86 | return new_sstr; |
olaf@20 | 87 | } |
olaf@20 | 88 | |
olaf@20 | 89 | int sstrcmp(sstr_t s1, sstr_t s2) { |
olaf@20 | 90 | return strncmp(s1.ptr, s2.ptr, s1.length>s2.length ? s2.length: s1.length); |
olaf@20 | 91 | } |
olaf@20 | 92 | |
olaf@20 | 93 | sstr_t sstrdub(sstr_t s) { |
olaf@20 | 94 | sstr_t newstring; |
universe@24 | 95 | newstring.ptr = (char*) malloc(s.length + 1); |
universe@24 | 96 | if (newstring.ptr != NULL) { |
universe@24 | 97 | newstring.length = s.length; |
universe@24 | 98 | newstring.ptr[newstring.length] = 0; |
olaf@20 | 99 | |
universe@24 | 100 | memcpy(newstring.ptr, s.ptr, s.length); |
universe@24 | 101 | } |
olaf@20 | 102 | |
olaf@20 | 103 | return newstring; |
olaf@20 | 104 | } |