diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2019-01-12 10:04:05 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-22 13:06:17 +1300 |
| commit | fc66c767fbf552743c13ecec4141a4c153490cd5 (patch) | |
| tree | f60f65003442e154d1f39e5ec313e280e70757f0 /core | |
| parent | 7598e2fce724ba42d1b9be4dbd7adfa169473e28 (diff) | |
| download | subsurface-fc66c767fbf552743c13ecec4141a4c153490cd5.tar.gz | |
Don't allow empty username for git
When no real name is set in /etc/passwd the username ends
up being ",,,". Git does not like that. Actually, only the
part before the first comma is the name, the rest is office
and phone number. We don't want those.
Before we only testing for the username being a NULL pointer.
Reported-by: Keith Grimes
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'core')
| -rw-r--r-- | core/save-git.c | 2 | ||||
| -rw-r--r-- | core/unix.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/core/save-git.c b/core/save-git.c index 422201324..ac6c4d922 100644 --- a/core/save-git.c +++ b/core/save-git.c @@ -1040,7 +1040,7 @@ static int get_authorship(git_repository *repo, git_signature **authorp) /* try to fetch the user info from the OS, otherwise use default values. */ struct user_info user = { .name = NULL, .email = NULL }; subsurface_user_info(&user); - if (!user.name) + if (!user.name || !*user.name) user.name = strdup("Subsurface"); if (!user.email) user.email = strdup("subsurface-app-account@subsurface-divelog.org"); diff --git a/core/unix.c b/core/unix.c index 1d92a1ad3..5b1cc3720 100644 --- a/core/unix.c +++ b/core/unix.c @@ -38,8 +38,18 @@ void subsurface_user_info(struct user_info *user) const char *username = getenv("USER"); if (pwd) { - if (!empty_string(pwd->pw_gecos)) + if (!empty_string(pwd->pw_gecos)) { user->name = strdup(pwd->pw_gecos); + // We only want the name, not the office or phone number + char *c = user->name; + while (*c) { + if (*c == ',') { + *c = '\0'; + break; + } + ++c; + } + } if (!username) username = pwd->pw_name; } |