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/GUITerminal - Backspace and over-greedy fix
[tpg/acess2.git]
/
Usermode
/
Applications
/
telnet_src
/
main.c
diff --git
a/Usermode/Applications/telnet_src/main.c
b/Usermode/Applications/telnet_src/main.c
index
d1f8d17
..
708935d
100644
(file)
--- a/
Usermode/Applications/telnet_src/main.c
+++ b/
Usermode/Applications/telnet_src/main.c
@@
-7,8
+7,6
@@
#include <readline.h>
\r
#include <string.h>
\r
\r
#include <readline.h>
\r
#include <string.h>
\r
\r
-#define BUFSIZ 128
\r
-
\r
// === PROTOTYPES ===
\r
int main(int argc, char *argv[], char *envp[]);
\r
int OpenTCP(const char *AddressString, short PortNumber);
\r
// === PROTOTYPES ===
\r
int main(int argc, char *argv[], char *envp[]);
\r
int OpenTCP(const char *AddressString, short PortNumber);
\r
@@
-20,9
+18,20
@@
int main(int argc, char *argv[], char *envp[])
int client_running = 1;
\r
int bUseReadline = !!argv[3]; // HACK: If third argument is present, use ReadLine
\r
tReadline *readline_info;
\r
int client_running = 1;
\r
int bUseReadline = !!argv[3]; // HACK: If third argument is present, use ReadLine
\r
tReadline *readline_info;
\r
+ int port;
\r
+
\r
+ if( argc < 2 || argc > 3 ) {
\r
+ fprintf(stderr, "Usage: telnet <host> [<port>]\n Port defaults to 23\n");
\r
+ return 0;
\r
+ }
\r
+
\r
+ if(argc == 3)
\r
+ port = atoi(argv[2]);
\r
+ else
\r
+ port = 23;
\r
\r
// Connect to the remove server
\r
\r
// Connect to the remove server
\r
- server_fd = OpenTCP( argv[1],
atoi(argv[2])
);
\r
+ server_fd = OpenTCP( argv[1],
port
);
\r
if( server_fd == -1 ) {
\r
fprintf(stderr, "Unable to create socket\n");
\r
return -1;
\r
if( server_fd == -1 ) {
\r
fprintf(stderr, "Unable to create socket\n");
\r
return -1;
\r
@@
-53,8
+62,8
@@
int main(int argc, char *argv[], char *envp[])
// Read from server, and write to stdout
\r
do
\r
{
\r
// Read from server, and write to stdout
\r
do
\r
{
\r
- len =
read(server_fd, BUFSIZ, buffer
);
\r
-
write(1, len, buffer
);
\r
+ len =
_SysRead(server_fd, buffer, BUFSIZ
);
\r
+
_SysWrite(1, buffer, len
);
\r
} while( len == BUFSIZ );
\r
}
\r
\r
} while( len == BUFSIZ );
\r
}
\r
\r
@@
-67,17
+76,17
@@
int main(int argc, char *argv[], char *envp[])
char *line = Readline_NonBlock(readline_info);
\r
if( line )
\r
{
\r
char *line = Readline_NonBlock(readline_info);
\r
if( line )
\r
{
\r
-
write(server_fd, strlen(line), line
);
\r
-
write(server_fd, 1, "\n"
);
\r
+
_SysWrite(server_fd, line, strlen(line)
);
\r
+
_SysWrite(server_fd, "\n", 1
);
\r
}
\r
}
\r
else
\r
{
\r
do
\r
{
\r
}
\r
}
\r
else
\r
{
\r
do
\r
{
\r
- len =
read(0, BUFSIZ, buffer
);
\r
-
write(server_fd, len, buffer
);
\r
-
write(1, len, buffer
);
\r
+ len =
_SysRead(0, buffer, BUFSIZ
);
\r
+
_SysWrite(server_fd, buffer, len
);
\r
+
_SysWrite(1, buffer, len
);
\r
} while( len == BUFSIZ );
\r
}
\r
}
\r
} while( len == BUFSIZ );
\r
}
\r
}
\r
@@
-90,7
+99,7
@@
int main(int argc, char *argv[], char *envp[])
}
\r
}
\r
\r
}
\r
}
\r
\r
-
c
lose(server_fd);
\r
+
_SysC
lose(server_fd);
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
@@
-118,11
+127,11
@@
int OpenTCP(const char *AddressString, short PortNumber)
}
\r
\r
// Set remote port and address
\r
}
\r
\r
// Set remote port and address
\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
\r
// Connect
\r
- if(
ioc
tl(fd, 7, NULL) == 0 ) {
\r
+ if(
_SysIOC
tl(fd, 7, NULL) == 0 ) {
\r
fprintf(stderr, "Unable to start connection\n");
\r
return -1;
\r
}
\r
fprintf(stderr, "Unable to start connection\n");
\r
return -1;
\r
}
\r
UCC
git Repository :: git.ucc.asn.au