philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the -z command line option and the use of the IRCUSER environment variable.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@93 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Tim Cava
2010-07-30 09:52:17 +00:00
parent 28f8b2c9af
commit a72091bb0e
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/irc.c
View File

@@ -1026,6 +1026,37 @@ static char *parse_args (char *argv[], int argc, char **envp)
set_string_var(LOAD_PATH_VAR, irc_path);
new_free(&irc_path);
/*
* Yes... this is EXACTLY what you think it is. And if you don't know..
* then I'm not about to tell you! -- Jake [WinterHawk] Khuon
*
* Here we determine our username. It may be set above, by the -z command line
* option. If not check IRCUSER, then USER, then the IDENT_HACK file, then
* fallback to gecos below.
*/
if (!*username && (ptr = getenv("IRCUSER"))) strmcpy(username, ptr, NAME_LEN);
else if (!*username && (ptr = getenv("USER"))) strmcpy(username, ptr, NAME_LEN);
else if (!*username)
{
#ifdef IDENT_FAKE
char *p = NULL, *q = NULL;
FILE *f;
malloc_sprintf(&p, "~/%s", get_string_var(IDENT_HACK_VAR));
q = expand_twiddle(p);
if ((f = fopen(q, "r")))
{
fgets(username, NAME_LEN, f);
if (*username && strchr(username, '\n'))
username[strlen(username)-1] = 0;
}
fclose(f);
new_free(&p); new_free(&q);
if (!*username)
#endif
strmcpy(username, "Unknown", NAME_LEN);
}
#ifndef WINNT
if ((entry = getpwuid(getuid())))
{
@@ -1081,33 +1112,6 @@ static char *parse_args (char *argv[], int argc, char **envp)
if (!*realname)
strmcpy(realname, "* I'm too lame to read BitchX.doc *", REALNAME_LEN);
/*
* Yes... this is EXACTLY what you think it is. And if you don't know..
* then I'm not about to tell you! -- Jake [WinterHawk] Khuon
*/
if ((ptr = getenv("IRCUSER"))) strmcpy(username, ptr, NAME_LEN);
else if ((ptr = getenv("USER"))) strmcpy(username, ptr, NAME_LEN);
else if (!*username)
{
#ifdef IDENT_FAKE
char *p = NULL, *q = NULL;
FILE *f;
malloc_sprintf(&p, "~/%s", get_string_var(IDENT_HACK_VAR));
q = expand_twiddle(p);
if ((f = fopen(q, "r")))
{
fgets(username, NAME_LEN, f);
if (*username && strchr(username, '\n'))
username[strlen(username)-1] = 0;
}
fclose(f);
new_free(&p); new_free(&q);
if (!*username)
#endif
strmcpy(username, "Unknown", NAME_LEN);
}
if (!LocalHostName && ((ptr = getenv("IRC_HOST")) || (ptr = getenv("IRCHOST"))))
LocalHostName = m_strdup(ptr);