Commit f3ff649d3bf7c206460faa130d10406d1284bae0
1 parent
953569d2
openpty fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1119 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
5 additions
and
5 deletions
slirp/misc.c
| @@ -227,8 +227,8 @@ fork_exec(so, ex, do_pty) | @@ -227,8 +227,8 @@ fork_exec(so, ex, do_pty) | ||
| 227 | #else | 227 | #else |
| 228 | 228 | ||
| 229 | int | 229 | int |
| 230 | -openpty(amaster, aslave) | ||
| 231 | - int *amaster, *aslave; | 230 | +slirp_openpty(amaster, aslave) |
| 231 | + int *amaster, *aslave; | ||
| 232 | { | 232 | { |
| 233 | register int master, slave; | 233 | register int master, slave; |
| 234 | 234 | ||
| @@ -328,7 +328,7 @@ fork_exec(so, ex, do_pty) | @@ -328,7 +328,7 @@ fork_exec(so, ex, do_pty) | ||
| 328 | DEBUG_ARG("do_pty = %lx", (long)do_pty); | 328 | DEBUG_ARG("do_pty = %lx", (long)do_pty); |
| 329 | 329 | ||
| 330 | if (do_pty == 2) { | 330 | if (do_pty == 2) { |
| 331 | - if (openpty(&master, &s) == -1) { | 331 | + if (slirp_openpty(&master, &s) == -1) { |
| 332 | lprint("Error: openpty failed: %s\n", strerror(errno)); | 332 | lprint("Error: openpty failed: %s\n", strerror(errno)); |
| 333 | return 0; | 333 | return 0; |
| 334 | } | 334 | } |
| @@ -881,7 +881,7 @@ rsh_exec(so,ns, user, host, args) | @@ -881,7 +881,7 @@ rsh_exec(so,ns, user, host, args) | ||
| 881 | return 0; | 881 | return 0; |
| 882 | } | 882 | } |
| 883 | #else | 883 | #else |
| 884 | - if (openpty(&fd0[0], &fd0[1]) == -1) { | 884 | + if (slirp_openpty(&fd0[0], &fd0[1]) == -1) { |
| 885 | close(fd[0]); | 885 | close(fd[0]); |
| 886 | close(fd[1]); | 886 | close(fd[1]); |
| 887 | lprint("Error: openpty failed: %s\n", strerror(errno)); | 887 | lprint("Error: openpty failed: %s\n", strerror(errno)); |
slirp/misc.h
| @@ -73,7 +73,7 @@ void getouraddr _P((void)); | @@ -73,7 +73,7 @@ void getouraddr _P((void)); | ||
| 73 | inline void slirp_insque _P((void *, void *)); | 73 | inline void slirp_insque _P((void *, void *)); |
| 74 | inline void slirp_remque _P((void *)); | 74 | inline void slirp_remque _P((void *)); |
| 75 | int add_exec _P((struct ex_list **, int, char *, int, int)); | 75 | int add_exec _P((struct ex_list **, int, char *, int, int)); |
| 76 | -int openpty _P((int *, int *)); | 76 | +int slirp_openpty _P((int *, int *)); |
| 77 | int fork_exec _P((struct socket *, char *, int)); | 77 | int fork_exec _P((struct socket *, char *, int)); |
| 78 | void snooze_hup _P((int)); | 78 | void snooze_hup _P((int)); |
| 79 | void snooze _P((void)); | 79 | void snooze _P((void)); |