diff options
| author | 2009-08-19 00:17:41 (JST) | |
|---|---|---|
| committer | 2009-08-19 00:22:14 (JST) | |
| commit | e16f1783346a090e4ea1194dcaae7f03e813f6a2 (patch) | |
| tree | 268f5ba231895ba3a63071497764c64d44733da5 /ui-repolist.c | |
| parent | 523c133e2e5f7089a3d18ac23f2074b60991a7f0 (diff) | |
| download | cgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.zip cgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.tar.gz | |
Add and use a common readfile() function
This function is used to read the full content of a textfile into a
newly allocated buffer (with zerotermination).
It replaces the earlier readfile() in scan-tree.c (which was rather
error-prone[1]), and is reused by read_agefile() in ui-repolist.c.
1: No checks for EINTR and EAGAIN, fixed-size buffer
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-repolist.c')
| -rw-r--r-- | ui-repolist.c | 19 | 
1 files changed, 10 insertions, 9 deletions
| diff --git a/ui-repolist.c b/ui-repolist.c index 6d2f93f..7c7aa9b 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
| @@ -18,19 +18,20 @@ | |||
| 18 | 18 | ||
| 19 | time_t read_agefile(char *path) | 19 | time_t read_agefile(char *path) | 
| 20 | { | 20 | { | 
| 21 | FILE *f; | 21 | time_t result; | 
| 22 | static char buf[64], buf2[64]; | 22 | size_t size; | 
| 23 | char *buf; | ||
| 24 | static char buf2[64]; | ||
| 23 | 25 | ||
| 24 | if (!(f = fopen(path, "r"))) | 26 | if (readfile(path, &buf, &size)) | 
| 25 | return -1; | 27 | return -1; | 
| 26 | buf[0] = 0; | 28 | |
| 27 | if (fgets(buf, sizeof(buf), f) == NULL) | ||
| 28 | return -1; | ||
| 29 | fclose(f); | ||
| 30 | if (parse_date(buf, buf2, sizeof(buf2))) | 29 | if (parse_date(buf, buf2, sizeof(buf2))) | 
| 31 | return strtoul(buf2, NULL, 10); | 30 | result = strtoul(buf2, NULL, 10); | 
| 32 | else | 31 | else | 
| 33 | return 0; | 32 | result = 0; | 
| 33 | free(buf); | ||
| 34 | return result; | ||
| 34 | } | 35 | } | 
| 35 | 36 | ||
| 36 | static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) | 37 | static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) | 
