ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openpty fix 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1119 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-10-10 18:00:00 +00:00
parent 953569d21b
commit f3ff649d3b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slirp/misc.c
View File

@ -227,7 +227,7 @@ fork_exec(so, ex, do_pty)
#else #else
int int
openpty(amaster, aslave) slirp_openpty(amaster, aslave)
int *amaster, *aslave; int *amaster, *aslave;
{ {
register int master, slave; register int master, slave;
@ -328,7 +328,7 @@ fork_exec(so, ex, do_pty)
DEBUG_ARG("do_pty = %lx", (long)do_pty); DEBUG_ARG("do_pty = %lx", (long)do_pty);
if (do_pty == 2) { if (do_pty == 2) {
if (openpty(&master, &s) == -1) { if (slirp_openpty(&master, &s) == -1) {
lprint("Error: openpty failed: %s\n", strerror(errno)); lprint("Error: openpty failed: %s\n", strerror(errno));
return 0; return 0;
} }
@ -881,7 +881,7 @@ rsh_exec(so,ns, user, host, args)
return 0; return 0;
} }
#else #else
if (openpty(&fd0[0], &fd0[1]) == -1) { if (slirp_openpty(&fd0[0], &fd0[1]) == -1) {
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
lprint("Error: openpty failed: %s\n", strerror(errno)); lprint("Error: openpty failed: %s\n", strerror(errno));

2
slirp/misc.h
View File

@ -73,7 +73,7 @@ void getouraddr _P((void));
inline void slirp_insque _P((void *, void *)); inline void slirp_insque _P((void *, void *));
inline void slirp_remque _P((void *)); inline void slirp_remque _P((void *));
int add_exec _P((struct ex_list **, int, char *, int, int)); int add_exec _P((struct ex_list **, int, char *, int, int));
int openpty _P((int *, int *)); int slirp_openpty _P((int *, int *));
int fork_exec _P((struct socket *, char *, int)); int fork_exec _P((struct socket *, char *, int));
void snooze_hup _P((int)); void snooze_hup _P((int));
void snooze _P((void)); void snooze _P((void));