| author | Lars Hjemli <hjemli@gmail.com> | 2009-08-18 15:17:41 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-18 15:22:14 (UTC) |
| commit | e16f1783346a090e4ea1194dcaae7f03e813f6a2 (patch) (unidiff) | |
| tree | 268f5ba231895ba3a63071497764c64d44733da5 /scan-tree.c | |
| parent | 523c133e2e5f7089a3d18ac23f2074b60991a7f0 (diff) | |
| download | cgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.zip cgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.tar.gz cgit-e16f1783346a090e4ea1194dcaae7f03e813f6a2.tar.bz2 | |
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>
| -rw-r--r-- | scan-tree.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/scan-tree.c b/scan-tree.c index 47f3988..95dc65b 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
| @@ -37,15 +37,2 @@ static int is_git_dir(const char *path) | |||
| 37 | 37 | ||
| 38 | char *readfile(const char *path) | ||
| 39 | { | ||
| 40 | FILE *f; | ||
| 41 | static char buf[MAX_PATH]; | ||
| 42 | |||
| 43 | if (!(f = fopen(path, "r"))) | ||
| 44 | return NULL; | ||
| 45 | buf[0] = 0; | ||
| 46 | fgets(buf, MAX_PATH, f); | ||
| 47 | fclose(f); | ||
| 48 | return buf; | ||
| 49 | } | ||
| 50 | |||
| 51 | static void add_repo(const char *base, const char *path) | 38 | static void add_repo(const char *base, const char *path) |
| @@ -56,2 +43,3 @@ static void add_repo(const char *base, const char *path) | |||
| 56 | char *p; | 43 | char *p; |
| 44 | size_t size; | ||
| 57 | 45 | ||
| @@ -82,3 +70,3 @@ static void add_repo(const char *base, const char *path) | |||
| 82 | if (!stat(p, &st)) | 70 | if (!stat(p, &st)) |
| 83 | repo->desc = xstrdup(readfile(p)); | 71 | readfile(p, &repo->desc, &size); |
| 84 | 72 | ||