This commit is contained in:
joonicks
2018-04-04 16:25:26 +02:00
parent 581c44e7fb
commit 9008fd1fd9
6 changed files with 41 additions and 25 deletions

View File

@@ -364,7 +364,6 @@ LS int nickcmp(const char *, const char *) __attr(CORE_SEG, __regparm(2));
LS char *nickcpy(char *, const char *) __attr(CORE_SEG, __regparm(2));
LS void stringcpy_n(char *, const char *, int) __attr(CORE_SEG, __regparm(3));
LS char *stringcpy(char *, const char *) __attr(CORE_SEG, __regparm(2));
LS char *stringcpy2(char *, const char *, const char *) __attr(CORE_SEG, __regparm(3));
LS char *stringchr(const char *, int) __attr(CORE_SEG, __regparm(2));
LS char *stringdup(const char *) __attr(CORE_SEG, __regparm(1));
LS char *stringcat(char *, const char *) __attr(CORE_SEG, __regparm(2));

View File

@@ -948,13 +948,13 @@ int main(int argc, char **argv, char **envp)
else
to_file(1,"error: Missing argument for -p <string>\n");
_exit(0);
case 't':
startup = 666;
break;
case 'X':
debug_on_exit = TRUE;
break;
#endif /* DEBUG */
case 't':
startup = 666;
break;
case 'f':
if (opt[2] != 0)
{

View File

@@ -80,8 +80,8 @@
#define TEXT_SERVERDELETED "Server has been deleted: %s:%i"
#define TEXT_MANYSERVMATCH "Several entries for %s exists, please specify port also"
/* do_core() */
#define TEXT_CURRNICKWANT "Current nick\t%s (Wanted: %s) [#%i]"
#define TEXT_CURRNICKHAS "Current nick\t%s [#%i]"
#define TEXT_CURRNICKWANT "Current nick\t%s (Wanted: %s) [guid #%i]"
#define TEXT_CURRNICKHAS "Current nick\t%s [guid #%i]"
#define TEXT_USERLISTSTATS "Users in userlist\t%i (%i Superuser%s, %i Bot%s)"
#define TEXT_ACTIVECHANS "Active channels\t%s"
#define TEXT_MOREACTIVECHANS "\t%s"

View File

@@ -361,7 +361,7 @@ ascii_badfile:
to_user_q(from,"%s","Bad filename or file does not exist");
return;
}
stringcat(stringcpy2(fname,"ascii/"),rest);
stringcat(stringcpy(fname,"ascii/"),rest);
if (is_safepath(fname,FILE_MUST_EXIST) != FILE_IS_SAFE)
goto ascii_badfile;
if ((fd = open(fname,O_RDONLY)) < 0)