mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ident: do not drop username when reading from /etc/mailname

Browse Source 
An earlier conversion from fgets() to strbuf_getline() in the
codepath to read from /etc/mailname to learn the default host-part
of the ident e-mail address forgot that strbuf_getline() stores the
line at the beginning of the buffer just like fgets().

The "username@" the caller has prepared in the strbuf, expecting the
function to append the host-part to it, was lost because of this.

Reported-by: Mihai Rusu <dizzy@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
2013-01-24 15:21:46 -08:00
committed by Junio C Hamano
parent 7e2010537e
commit dc342a25d1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ident.c
View File

@ -41,6 +41,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) {
@ -49,14 +50,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;
} }