git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Usermode/init - Fixed early free of command, fixed %s on array
[tpg/acess2.git]
/
Usermode
/
Applications
/
irc_src
/
main.c
diff --git
a/Usermode/Applications/irc_src/main.c
b/Usermode/Applications/irc_src/main.c
index
901e8ac
..
4ca2415
100644
(file)
--- a/
Usermode/Applications/irc_src/main.c
+++ b/
Usermode/Applications/irc_src/main.c
@@
-78,7
+78,7
@@
char *gsNickname = "acess";
tServer *gpServers;
\r
tWindow gWindow_Status = {
\r
NULL, NULL, NULL, // No next, empty list, no server
\r
tServer *gpServers;
\r
tWindow gWindow_Status = {
\r
NULL, NULL, NULL, // No next, empty list, no server
\r
- 0,
""
// No activity, empty name (rendered as status)
\r
+ 0,
{""}
// No activity, empty name (rendered as status)
\r
};
\r
tWindow *gpWindows = &gWindow_Status;
\r
tWindow *gpCurrentWindow = &gWindow_Status;
\r
};
\r
tWindow *gpWindows = &gWindow_Status;
\r
tWindow *gpCurrentWindow = &gWindow_Status;
\r
@@
-102,8
+102,8
@@
int main(int argc, const char *argv[], const char *envp[])
\r
atexit(ExitHandler);
\r
\r
\r
atexit(ExitHandler);
\r
\r
- giTerminal_Width =
ioctl(1, 5, NULL);
// getset_width
\r
- giTerminal_Height =
ioctl(1, 6, NULL);
// getset_height
\r
+ giTerminal_Width =
_SysIOCtl(1, 5, NULL);
// getset_width
\r
+ giTerminal_Height =
_SysIOCtl(1, 6, NULL);
// getset_height
\r
\r
printf("\x1B[?1047h");
\r
printf("\x1B[%i;%ir", 0, giTerminal_Height-1);
\r
\r
printf("\x1B[?1047h");
\r
printf("\x1B[%i;%ir", 0, giTerminal_Height-1);
\r
@@
-194,7
+194,7
@@
int main(int argc, const char *argv[], const char *envp[])
{
\r
tServer *srv;
\r
for( srv = gpServers; srv; srv = srv->Next )
\r
{
\r
tServer *srv;
\r
for( srv = gpServers; srv; srv = srv->Next )
\r
-
c
lose(srv->FD);
\r
+
_SysC
lose(srv->FD);
\r
}
\r
return 0;
\r
}
\r
}
\r
return 0;
\r
}
\r
@@
-340,7
+340,7
@@
tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const c
va_list args;
\r
int len;
\r
va_start(args, Message);
\r
va_list args;
\r
int len;
\r
va_start(args, Message);
\r
- len = vsnprintf(NULL,
100
0, Message, args);
\r
+ len = vsnprintf(NULL, 0, Message, args);
\r
{
\r
char buf[len+1];
\r
vsnprintf(buf, len+1, Message, args);
\r
{
\r
char buf[len+1];
\r
vsnprintf(buf, len+1, Message, args);
\r
@@
-578,6
+578,7
@@
void ParseServerLine(tServer *Server, char *Line)
Message_Append(Server, MSG_TYPE_SERVER, user, user, message);
\r
break;
\r
case 372: // MOTD Data
\r
Message_Append(Server, MSG_TYPE_SERVER, user, user, message);
\r
break;
\r
case 372: // MOTD Data
\r
+ case 375: // MOTD Start
\r
case 376: // MOTD End
\r
\r
default:
\r
case 376: // MOTD End
\r
\r
default:
\r
@@
-601,6
+602,10
@@
void ParseServerLine(tServer *Server, char *Line)
}
\r
\r
//printf("[%s] NOTICE %s: %s\n", Server->Name, ident, message);
\r
}
\r
\r
//printf("[%s] NOTICE %s: %s\n", Server->Name, ident, message);
\r
+ char *ident_bang = strchr(ident, '!');
\r
+ if( ident_bang ) {
\r
+ *ident_bang = '\0';
\r
+ }
\r
Message_Append(Server, MSG_TYPE_NOTICE, ident, "", message);
\r
}
\r
else if( strcmp(cmd, "PRIVMSG") == 0 )
\r
Message_Append(Server, MSG_TYPE_NOTICE, ident, "", message);
\r
}
\r
else if( strcmp(cmd, "PRIVMSG") == 0 )
\r
@@
-618,7
+623,10
@@
void ParseServerLine(tServer *Server, char *Line)
// TODO: Catch when the privmsg is addressed to the user
\r
\r
// Cmd_PRIVMSG(Server, dest, ident, message);
\r
// TODO: Catch when the privmsg is addressed to the user
\r
\r
// Cmd_PRIVMSG(Server, dest, ident, message);
\r
- *strchr(ident, '!') = '\0'; // Hello SIGSEGV
\r
+ char *ident_bang = strchr(ident, '!');
\r
+ if( ident_bang ) {
\r
+ *ident_bang = '\0';
\r
+ }
\r
Message_Append(Server, MSG_TYPE_STANDARD, ident, dest, message);
\r
}
\r
else if( strcmp(cmd, "JOIN" ) == 0 )
\r
Message_Append(Server, MSG_TYPE_STANDARD, ident, dest, message);
\r
}
\r
else if( strcmp(cmd, "JOIN" ) == 0 )
\r
@@
-659,11
+667,11
@@
int ProcessIncoming(tServer *Server)
// ioctl#8 on a TCP client gets the number of bytes in the recieve buffer
\r
// - Used to avoid blocking
\r
#if NON_BLOCK_READ
\r
// ioctl#8 on a TCP client gets the number of bytes in the recieve buffer
\r
// - Used to avoid blocking
\r
#if NON_BLOCK_READ
\r
- while( (len =
ioc
tl(Server->FD, 8, NULL)) > 0 )
\r
+ while( (len =
_SysIOC
tl(Server->FD, 8, NULL)) > 0 )
\r
{
\r
#endif
\r
// Read data
\r
{
\r
#endif
\r
// Read data
\r
- len =
r
ead(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);
\r
+ len =
_SysR
ead(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);
\r
if( len == -1 ) {
\r
return -1;
\r
}
\r
if( len == -1 ) {
\r
return -1;
\r
}
\r
@@
-708,7
+716,7
@@
int writef(int FD, const char *Format, ...)
int len;
\r
\r
va_start(args, Format);
\r
int len;
\r
\r
va_start(args, Format);
\r
- len = vsnprintf(NULL,
100
0, Format, args);
\r
+ len = vsnprintf(NULL, 0, Format, args);
\r
va_end(args);
\r
\r
{
\r
va_end(args);
\r
\r
{
\r
@@
-717,7
+725,7
@@
int writef(int FD, const char *Format, ...)
vsnprintf(buf, len+1, Format, args);
\r
va_end(args);
\r
\r
vsnprintf(buf, len+1, Format, args);
\r
va_end(args);
\r
\r
- return
w
rite(FD, buf, len);
\r
+ return
_SysW
rite(FD, buf, len);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-747,12
+755,12
@@
int OpenTCP(const char *AddressString, short PortNumber)
\r
// Set remote port and address
\r
// printf("Setting port and remote address\n");
\r
\r
// Set remote port and address
\r
// printf("Setting port and remote address\n");
\r
-
ioc
tl(fd, 5, &PortNumber);
\r
-
ioc
tl(fd, 6, addrBuffer);
\r
+
_SysIOC
tl(fd, 5, &PortNumber);
\r
+
_SysIOC
tl(fd, 6, addrBuffer);
\r
\r
// Connect
\r
// printf("Initiating connection\n");
\r
\r
// Connect
\r
// printf("Initiating connection\n");
\r
- if(
ioc
tl(fd, 7, NULL) == 0 ) {
\r
+ if(
_SysIOC
tl(fd, 7, NULL) == 0 ) {
\r
// Shouldn't happen :(
\r
fprintf(stderr, "Unable to start connection\n");
\r
return -1;
\r
// Shouldn't happen :(
\r
fprintf(stderr, "Unable to start connection\n");
\r
return -1;
\r
@@
-797,7
+805,7
@@
int SetCursorPos(int Row, int Col)
Row = Col / giTerminal_Width;
\r
Col = Col % giTerminal_Width;
\r
}
\r
Row = Col / giTerminal_Width;
\r
Col = Col % giTerminal_Width;
\r
}
\r
- rv =
ioctl(1, 9, NULL);
// Ugh, constants
\r
+ rv =
_SysIOCtl(1, 9, NULL);
// Ugh, constants
\r
printf("\x1B[%i;%iH", Col, Row);
\r
return rv;
\r
}
\r
printf("\x1B[%i;%iH", Col, Row);
\r
return rv;
\r
}
\r
UCC
git Repository :: git.ucc.asn.au