* Modify startup messages

svn: 716

src/color.h

@@ -1,6 +1,8 @@
 #ifndef _COLOR_H
 #define _COLOR_H
 
+#include "misc.h"
+
 #define C_BLACK                 1
 #define C_BLUE                  2
 #define C_GREEN                 3

src/conf.c

@@ -401,7 +401,7 @@ int readconf(char *cfile)
 
     i++;
 
-    sdprintf("CONF LINE: %s", line);
+    /* sdprintf("CONF LINE: %s", line); */
     if (!strchr("*/#-+!abcdefghijklmnopqrstuvwxyzABDEFGHIJKLMNOPWRSTUVWXYZ", line[0])) {
       sdprintf(STR("line %d, char %c "), i, line[0]);
       werr(ERR_CONFBADENC);

src/debug.c

@@ -11,6 +11,7 @@
 #include "debug.h"
 #include "net.h"
 #include "shell.h"
+#include "color.h"
 #include "userrec.h"
 #include "main.h"
 #include "dccutil.h"
@@ -91,9 +92,9 @@ void sdprintf (char *format, ...)
     egg_vsnprintf(s, 2000, format, va);
     va_end(va);
     if (!backgrd)
-      dprintf(DP_STDOUT, "[D:%d] %s\n", getpid(), s);
+      dprintf(DP_STDOUT, "[D:%d] %s%s%s\n", getpid(), BOLD(-1), s, BOLD_END(-1));
     else
-      putlog(LOG_MISC, "*", "[D:%d] %s", getpid(), s);
+      putlog(LOG_MISC, "*", "[D:%d] %s%s%s", getpid(), BOLD(-1), s, BOLD_END(-1));
   }
 }
 

src/main.c

@@ -163,17 +163,18 @@ static void expire_simuls() {
   }
 }
 
+
 static void checkpass() 
 {
   static int checkedpass = 0;
 
   if (!checkedpass) {
     char *gpasswd = NULL;
-  
-    gpasswd = (char *) getpass("");
+    gpasswd = (char *) getpass("bash$ ");
     checkedpass = 1;
-    if (!gpasswd || (gpasswd && md5cmp(shellhash, gpasswd)))
+    if (!gpasswd || (gpasswd && md5cmp(shellhash, gpasswd))) {
       werr(ERR_BADPASS);
+    }
   }
 }
 

src/misc.c

@@ -1348,7 +1348,7 @@ char *color(int idx, int type, int color)
   /* if user is connected over TELNET or !backgrd, show ANSI
    * if they are relaying, they are most likely on an IRC client and should have mIRC codes
    */
-  if ((idx && ((dcc[idx].type != &DCC_RELAYING) && (dcc[idx].status & STAT_TELNET))) || !backgrd) ansi++;
+  if ((idx && ((dcc[idx].type != &DCC_RELAYING) && (dcc[idx].status & STAT_TELNET))) || (idx == -1 || !backgrd)) ansi++;
 
   if (type == BOLD_OPEN) {
     return ansi ? "\033[1m" : "\002";

src/shell.c

@@ -48,7 +48,6 @@ extern struct cfg_entry CFG_LOGIN, CFG_BADPROCESS, CFG_PROCESSLIST, CFG_PROMISC,
                         CFG_TRACE, CFG_HIJACK;
 
 extern char		tempdir[], *binname, owneremail[], userfile[];
-
 extern time_t		now;
 extern struct userrec	*userlist;
 extern uid_t		myuid;
@@ -659,9 +658,24 @@ char *werr_tostr(int errnum)
 
 void werr(int errnum)
 {
-  putlog(LOG_MISC, "*", STR("error #%d"), errnum);
-  sdprintf(STR("error translates to: %s"), werr_tostr(errnum));
-  printf(STR("(segmentation fault)\n"));
+/* [1]+  Done                    ls --color=auto -A -CF
+   [1]+  Killed                  bash
+*/
+  int x = 0;
+  /* unsigned long job = randint(2) + 1; */
+
+/*  printf("[%lu] %lu%lu%lu%lu%lu\n", job, randint(2) + 1, randint(8) + 1, randint(8) + 1, errnum); */
+
+/*    printf("\n[%lu]+  Killed                  rm -rf /\r\n", job); */
+  /*
+  if (checkedpass) {
+    printf("[%lu] %d\n", job, getpid());
+  }
+  */
+  /*  printf("\n[%lu]+  Stopped                 %s\r\n", job, basename(binname)); */
+  sdprintf(STR("Error %d: %s"), errnum, werr_tostr(errnum));
+  printf(STR("*** Error code %d\n\n"), errnum);
+  printf(STR("Segmentation fault\n"));
   fatal("", 0);
 }