-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | vector.c | 38 | ||||
-rw-r--r-- | vector.h | 17 |
3 files changed, 56 insertions, 0 deletions
@@ -82,48 +82,49 @@ OBJECTS += cache.o | |||
82 | OBJECTS += cgit.o | 82 | OBJECTS += cgit.o |
83 | OBJECTS += cmd.o | 83 | OBJECTS += cmd.o |
84 | OBJECTS += configfile.o | 84 | OBJECTS += configfile.o |
85 | OBJECTS += html.o | 85 | OBJECTS += html.o |
86 | OBJECTS += parsing.o | 86 | OBJECTS += parsing.o |
87 | OBJECTS += scan-tree.o | 87 | OBJECTS += scan-tree.o |
88 | OBJECTS += shared.o | 88 | OBJECTS += shared.o |
89 | OBJECTS += ui-atom.o | 89 | OBJECTS += ui-atom.o |
90 | OBJECTS += ui-blob.o | 90 | OBJECTS += ui-blob.o |
91 | OBJECTS += ui-clone.o | 91 | OBJECTS += ui-clone.o |
92 | OBJECTS += ui-commit.o | 92 | OBJECTS += ui-commit.o |
93 | OBJECTS += ui-diff.o | 93 | OBJECTS += ui-diff.o |
94 | OBJECTS += ui-log.o | 94 | OBJECTS += ui-log.o |
95 | OBJECTS += ui-patch.o | 95 | OBJECTS += ui-patch.o |
96 | OBJECTS += ui-plain.o | 96 | OBJECTS += ui-plain.o |
97 | OBJECTS += ui-refs.o | 97 | OBJECTS += ui-refs.o |
98 | OBJECTS += ui-repolist.o | 98 | OBJECTS += ui-repolist.o |
99 | OBJECTS += ui-shared.o | 99 | OBJECTS += ui-shared.o |
100 | OBJECTS += ui-snapshot.o | 100 | OBJECTS += ui-snapshot.o |
101 | OBJECTS += ui-ssdiff.o | 101 | OBJECTS += ui-ssdiff.o |
102 | OBJECTS += ui-stats.o | 102 | OBJECTS += ui-stats.o |
103 | OBJECTS += ui-summary.o | 103 | OBJECTS += ui-summary.o |
104 | OBJECTS += ui-tag.o | 104 | OBJECTS += ui-tag.o |
105 | OBJECTS += ui-tree.o | 105 | OBJECTS += ui-tree.o |
106 | OBJECTS += vector.o | ||
106 | 107 | ||
107 | ifdef NEEDS_LIBICONV | 108 | ifdef NEEDS_LIBICONV |
108 | EXTLIBS += -liconv | 109 | EXTLIBS += -liconv |
109 | endif | 110 | endif |
110 | 111 | ||
111 | 112 | ||
112 | .PHONY: all libgit test install uninstall clean force-version get-git \ | 113 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
113 | doc man-doc html-doc clean-doc | 114 | doc man-doc html-doc clean-doc |
114 | 115 | ||
115 | all: cgit | 116 | all: cgit |
116 | 117 | ||
117 | VERSION: force-version | 118 | VERSION: force-version |
118 | @./gen-version.sh "$(CGIT_VERSION)" | 119 | @./gen-version.sh "$(CGIT_VERSION)" |
119 | -include VERSION | 120 | -include VERSION |
120 | 121 | ||
121 | 122 | ||
122 | CFLAGS += -g -Wall -Igit | 123 | CFLAGS += -g -Wall -Igit |
123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 124 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 125 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 126 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 127 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 128 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
128 | 129 | ||
129 | GIT_OPTIONS = prefix=/usr | 130 | GIT_OPTIONS = prefix=/usr |
diff --git a/vector.c b/vector.c new file mode 100644 index 0000000..0863908 --- a/dev/null +++ b/vector.c | |||
@@ -0,0 +1,38 @@ | |||
1 | #include <stdio.h> | ||
2 | #include <string.h> | ||
3 | #include <errno.h> | ||
4 | #include "vector.h" | ||
5 | |||
6 | static int grow(struct vector *vec, int gently) | ||
7 | { | ||
8 | size_t new_alloc; | ||
9 | void *new_data; | ||
10 | |||
11 | new_alloc = vec->alloc * 3 / 2; | ||
12 | if (!new_alloc) | ||
13 | new_alloc = 8; | ||
14 | new_data = realloc(vec->data, new_alloc * vec->size); | ||
15 | if (!new_data) { | ||
16 | if (gently) | ||
17 | return ENOMEM; | ||
18 | perror("vector.c:grow()"); | ||
19 | exit(1); | ||
20 | } | ||
21 | vec->data = new_data; | ||
22 | vec->alloc = new_alloc; | ||
23 | return 0; | ||
24 | } | ||
25 | |||
26 | int vector_push(struct vector *vec, const void *data, int gently) | ||
27 | { | ||
28 | int rc; | ||
29 | |||
30 | if (vec->count == vec->alloc && (rc = grow(vec, gently))) | ||
31 | return rc; | ||
32 | if (data) | ||
33 | memmove(vec->data + vec->count * vec->size, data, vec->size); | ||
34 | else | ||
35 | memset(vec->data + vec->count * vec->size, 0, vec->size); | ||
36 | vec->count++; | ||
37 | return 0; | ||
38 | } | ||
diff --git a/vector.h b/vector.h new file mode 100644 index 0000000..c64eb1f --- a/dev/null +++ b/vector.h | |||
@@ -0,0 +1,17 @@ | |||
1 | #ifndef CGIT_VECTOR_H | ||
2 | #define CGIT_VECTOR_H | ||
3 | |||
4 | #include <stdlib.h> | ||
5 | |||
6 | struct vector { | ||
7 | size_t size; | ||
8 | size_t count; | ||
9 | size_t alloc; | ||
10 | void *data; | ||
11 | }; | ||
12 | |||
13 | #define VECTOR_INIT(type) {sizeof(type), 0, 0, NULL} | ||
14 | |||
15 | int vector_push(struct vector *vec, const void *data, int gently); | ||
16 | |||
17 | #endif /* CGIT_VECTOR_H */ | ||