FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow empty username for git

Browse Source 
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>
This commit is contained in:
Robert C. Helling 2019-01-12 10:04:05 +01:00 committed by Dirk Hohndel
parent 7598e2fce7
commit fc66c767fb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/save-git.c
View File

@ -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");

12
core/unix.c
View File

@ -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;
}