If --uname then use it instead of username for default nick

config.c

@@ -118,6 +118,7 @@ int def_config(void)
 	username=strdup(eu?eu:"quirc");
 	fname=malloc(64+strlen(VERSION_TXT));
 	nick=strdup(eu?eu:"ac");
+	defnick=true;
 	snprintf(fname, 64+strlen(VERSION_TXT), "quIRC %hhu.%hhu.%hhu%s%s : http://github.com/ec429/quIRC", VERSION_MAJ, VERSION_MIN, VERSION_REV, VERSION_TXT[0]?"-":"", VERSION_TXT);
 	version=malloc(16+strlen(VERSION_TXT));
 	snprintf(version, 16+strlen(VERSION_TXT), "%hhu.%hhu.%hhu%s%s", VERSION_MAJ, VERSION_MIN, VERSION_REV, VERSION_TXT[0]?"-":"", VERSION_TXT);
@@ -245,7 +246,14 @@ int rcread(FILE *rcfp)
 			else if(strcmp(cmd, "port")==0)
 				portno=strdup(rest);
 			else if(strcmp(cmd, "uname")==0)
+			{
 				username=strdup(rest);
+				if(defnick)
+				{
+					free(nick);
+					nick=strdup(username);
+				}
+			}
 			else if(strcmp(cmd, "fname")==0)
 				fname=strdup(rest);
 			else if(servs && (strcmp(cmd, "*nick")==0))
@@ -254,7 +262,10 @@ int rcread(FILE *rcfp)
 				servs->nick=strdup(rest);
 			}
 			else if(strcmp(cmd, "nick")==0)
+			{
 				nick=strdup(rest);
+				defnick=false;
+			}
 			else if(strcmp(cmd, "ignore")==0)
 			{
 				char *sw=strtok(rest, " \t");
@@ -435,6 +446,11 @@ signed int pargs(int argc, char *argv[])
 		{
 			free(username);
 			username=strdup(argv[arg]+8);
+			if(defnick)
+			{
+				free(nick);
+				nick=strdup(username);
+			}
 		}
 		else if(strncmp(argv[arg], "--fname=", 8)==0)
 		{
@@ -445,6 +461,7 @@ signed int pargs(int argc, char *argv[])
 		{
 			free(nick);
 			nick=strdup(argv[arg]+7);
+			defnick=false;
 		}
 		else if(servs && (strncmp(argv[arg], "--chan=", 7)==0))
 		{

config.h

@@ -45,6 +45,7 @@ servlist;
 #include "config_globals.h"
 bool autojoin;
 char *username, *fname, *nick, *portno;
+bool defnick;
 servlist *servs;
 name *igns;
 char *version;

input.c

@@ -992,7 +992,8 @@ int cmd_handle(char *inp, char **qmsg, fd_set *master, int *fdmax) // old state=
 				{
 					bufs[0].nick=strdup(nn);
 					nick=strdup(nn);
-					if(!quiet) add_to_buffer(cbuf, c_status, "Default nick changed", "/nick ");
+					defnick=false;
+					if(!quiet) add_to_buffer(cbuf, c_status, "Default nick changed", "/nick: ");
 				}
 			}
 		}