diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-10-10 18:00:00 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-10-10 18:00:00 +0000 |
| commit | f3ff649d3bf7c206460faa130d10406d1284bae0 (patch) | |
| tree | 2a466bf9acf560a4921225618578251ba078413f | |
| parent | 953569d21bd552408d9714b48fb76c6003de6fe3 (diff) | |
openpty fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1119 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | slirp/misc.c | 8 | ||||
| -rw-r--r-- | slirp/misc.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/slirp/misc.c b/slirp/misc.c index 26f8eb578d..5b809a853a 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -227,8 +227,8 @@ fork_exec(so, ex, do_pty) #else int -openpty(amaster, aslave) - int *amaster, *aslave; +slirp_openpty(amaster, aslave) + int *amaster, *aslave; { register int master, slave; @@ -328,7 +328,7 @@ fork_exec(so, ex, do_pty) DEBUG_ARG("do_pty = %lx", (long)do_pty); if (do_pty == 2) { - if (openpty(&master, &s) == -1) { + if (slirp_openpty(&master, &s) == -1) { lprint("Error: openpty failed: %s\n", strerror(errno)); return 0; } @@ -881,7 +881,7 @@ rsh_exec(so,ns, user, host, args) return 0; } #else - if (openpty(&fd0[0], &fd0[1]) == -1) { + if (slirp_openpty(&fd0[0], &fd0[1]) == -1) { close(fd[0]); close(fd[1]); lprint("Error: openpty failed: %s\n", strerror(errno)); diff --git a/slirp/misc.h b/slirp/misc.h index 8e2819b99c..8e6a606c97 100644 --- a/slirp/misc.h +++ b/slirp/misc.h @@ -73,7 +73,7 @@ void getouraddr _P((void)); inline void slirp_insque _P((void *, void *)); inline void slirp_remque _P((void *)); 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)); void snooze_hup _P((int)); void snooze _P((void)); |