kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint 

We used to stuff "user@" and then append what we read from
/etc/mailname to come up with a default e-mail ident, but a bug lost
the "user@" part.

* jn/do-not-drop-username-when-reading-from-etc-mailname:
  ident: do not drop username when reading from /etc/mailname
maint
Junio C Hamano 2013-02-04 10:04:26 -08:00
parent 3d00a5c148 dc342a25d1
commit 7f3d409cd1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ident.c
View File

@ -46,6 +46,7 @@ static void copy_gecos(const struct passwd *w, struct strbuf *name)
static int add_mailname_host(struct strbuf *buf) static int add_mailname_host(struct strbuf *buf)
{ {
FILE *mailname; FILE *mailname;
struct strbuf mailnamebuf = STRBUF_INIT;


mailname = fopen("/etc/mailname", "r"); mailname = fopen("/etc/mailname", "r");
if (!mailname) { if (!mailname) {
@ -54,14 +55,17 @@ static int add_mailname_host(struct strbuf *buf)
strerror(errno)); strerror(errno));
return -1; return -1;
} }
if (strbuf_getline(buf, mailname, '\n') == EOF) { if (strbuf_getline(&mailnamebuf, mailname, '\n') == EOF) {
if (ferror(mailname)) if (ferror(mailname))
warning("cannot read /etc/mailname: %s", warning("cannot read /etc/mailname: %s",
strerror(errno)); strerror(errno));
strbuf_release(&mailnamebuf);
fclose(mailname); fclose(mailname);
return -1; return -1;
} }
/* success! */ /* success! */
strbuf_addbuf(buf, &mailnamebuf);
strbuf_release(&mailnamebuf);
fclose(mailname); fclose(mailname);
return 0; return 0;
} }