* Code cleanup

svn: 1018

src/chanprog.c

@@ -517,6 +517,7 @@ void chanprog()
 {
   /* char buf[2048] = ""; */
   struct bot_addr *bi = NULL;
+  struct utsname un;
 
   admin[0] = 0;
   /* cache our ip on load instead of every 30 seconds */
@@ -567,6 +568,12 @@ void chanprog()
 #endif /* HUB */
   }
 
+  /* set our shell info */
+  uname(&un);  
+  set_user(&USERENTRY_OS, conf.bot->u, un.sysname);
+  set_user(&USERENTRY_USERNAME, conf.bot->u, conf.username);
+  set_user(&USERENTRY_NODENAME, conf.bot->u, un.nodename);
+
   trigger_cfg_changed();
 
   /* We should be safe now */

src/users.c

@@ -659,7 +659,7 @@ void backup_userfile()
  * $$#chan channel Invites
  */
 
-int readuserfile(char *file, struct userrec **ret)
+int readuserfile(const char *file, struct userrec **ret)
 {
   char *p = NULL, buf[1024] = "", lasthand[512] = "", *attr = NULL, *pass = NULL;
   char *code = NULL, s1[1024] = "", *s = NULL, cbuf[1024] = "", *temps = NULL, ignored[512] = "";
@@ -689,7 +689,7 @@ int readuserfile(char *file, struct userrec **ret)
   s = buf;
   fgets(cbuf, 180, f);
   temps = (char *) decrypt_string(SALT1, cbuf);
-  egg_snprintf(s, 180, temps);
+  egg_snprintf(s, 180, "%s", temps);
   free(temps);
   if (s[1] < '4') {
     fatal(USERF_OLDFMT, 0);
@@ -700,7 +700,7 @@ int readuserfile(char *file, struct userrec **ret)
     s = buf;
     fgets(cbuf, 1024, f);
     temps = (char *) decrypt_string(SALT1, cbuf);
-    egg_snprintf(s, 1024, temps);
+    egg_snprintf(s, 1024, "%s", temps);
     free(temps);
     if (!feof(f)) {
       line++;

src/users.h

@@ -174,7 +174,7 @@ void autolink_cycle(char *);
 void tell_file_stats(int, char *);
 void tell_user_ident(int, char *, int);
 void tell_users_match(int, char *, int, int, int, char *);
-int readuserfile(char *, struct userrec **);
+int readuserfile(const char *, struct userrec **);
 void check_pmode();
 void link_pref_val(struct userrec *u, char *lval);