diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-15 02:47:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 12:59:57 +0900 |
commit | 501afcb8b021611758bf07d0e18fa8ff7fbbed73 (patch) | |
tree | 57f92e7957ba23bf9b0315825742c6ae7815c098 /compat | |
parent | getpwuid(mingw): provide a better default for the user name (diff) | |
download | tgif-501afcb8b021611758bf07d0e18fa8ff7fbbed73.tar.xz |
mingw: use domain information for default email
When a user is registered in a Windows domain, it is really easy to
obtain the email address. So let's do that.
Suggested by Lutz Roeder.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r-- | compat/mingw.c | 5 | ||||
-rw-r--r-- | compat/mingw.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 9055471293..45c8046c7c 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -1796,6 +1796,11 @@ static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type) return NULL; } +char *mingw_query_user_email(void) +{ + return get_extended_user_info(NameUserPrincipal); +} + struct passwd *getpwuid(int uid) { static unsigned initialized; diff --git a/compat/mingw.h b/compat/mingw.h index 571019d0bd..f31dcff2be 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -424,6 +424,8 @@ static inline void convert_slashes(char *path) int mingw_offset_1st_component(const char *path); #define offset_1st_component mingw_offset_1st_component #define PATH_SEP ';' +extern char *mingw_query_user_email(void); +#define query_user_email mingw_query_user_email #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800) #define PRIuMAX "I64u" #define PRId64 "I64d" |