author | Stefan Naewe <stefan.naewe@atlas-elektronik.com> | 2009-08-20 06:24:51 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-20 08:11:07 (UTC) |
commit | 6445a3ad0987ba66eef555c9caa3fc378f99ee22 (patch) (unidiff) | |
tree | d2cc2bf1e0fbe8a22d137095701b76d15fea3ca6 /scan-tree.c | |
parent | 0374a76ce10e50a803df21288888edd4d26a14a9 (diff) | |
download | cgit-6445a3ad0987ba66eef555c9caa3fc378f99ee22.zip cgit-6445a3ad0987ba66eef555c9caa3fc378f99ee22.tar.gz cgit-6445a3ad0987ba66eef555c9caa3fc378f99ee22.tar.bz2 |
scan-tree: split the pw_gecos field at the ',' to get the real name
Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | scan-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c index 95dc65b..4da21a4 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -51,32 +51,35 @@ static void add_repo(const char *base, const char *path) | |||
51 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 51 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
52 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | 52 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", |
53 | path, strerror(errno), errno); | 53 | path, strerror(errno), errno); |
54 | return; | 54 | return; |
55 | } | 55 | } |
56 | if (base == path) | 56 | if (base == path) |
57 | p = fmt("%s", path); | 57 | p = fmt("%s", path); |
58 | else | 58 | else |
59 | p = fmt("%s", path + strlen(base) + 1); | 59 | p = fmt("%s", path + strlen(base) + 1); |
60 | 60 | ||
61 | if (!strcmp(p + strlen(p) - 5, "/.git")) | 61 | if (!strcmp(p + strlen(p) - 5, "/.git")) |
62 | p[strlen(p) - 5] = '\0'; | 62 | p[strlen(p) - 5] = '\0'; |
63 | 63 | ||
64 | repo = cgit_add_repo(xstrdup(p)); | 64 | repo = cgit_add_repo(xstrdup(p)); |
65 | repo->name = repo->url; | 65 | repo->name = repo->url; |
66 | repo->path = xstrdup(path); | 66 | repo->path = xstrdup(path); |
67 | p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; | ||
68 | if (p) | ||
69 | *p = '\0'; | ||
67 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 70 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); |
68 | 71 | ||
69 | p = fmt("%s/description", path); | 72 | p = fmt("%s/description", path); |
70 | if (!stat(p, &st)) | 73 | if (!stat(p, &st)) |
71 | readfile(p, &repo->desc, &size); | 74 | readfile(p, &repo->desc, &size); |
72 | 75 | ||
73 | p = fmt("%s/README.html", path); | 76 | p = fmt("%s/README.html", path); |
74 | if (!stat(p, &st)) | 77 | if (!stat(p, &st)) |
75 | repo->readme = "README.html"; | 78 | repo->readme = "README.html"; |
76 | } | 79 | } |
77 | 80 | ||
78 | static void scan_path(const char *base, const char *path) | 81 | static void scan_path(const char *base, const char *path) |
79 | { | 82 | { |
80 | DIR *dir; | 83 | DIR *dir; |
81 | struct dirent *ent; | 84 | struct dirent *ent; |
82 | char *buf; | 85 | char *buf; |