aboutsummaryrefslogtreecommitdiff
path: root/src/clef
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-11-01 05:50:30 +0000
committerdos-reis <gdr@axiomatics.org>2008-11-01 05:50:30 +0000
commitb9495611c4ec4ae6adc2aef08f9a08aaf5df6f1c (patch)
tree2eb882ea95fa1b1e32156d7e881e109a97e13d3e /src/clef
parentad6ac4dc3c9662098ad38ca99cbf46d6315af52b (diff)
downloadopen-axiom-b9495611c4ec4ae6adc2aef08f9a08aaf5df6f1c.tar.gz
* sman/sman.c (ptsPath): Remove.
* sman/Makefile.in: Add additional C runtimes for link. * lib/openpty.c: Include <pty.h> and <util.h> where available. (ptyopen): Lose third parameter. Tidy. (makeNextPtyNames): Now static. * clef/edible.c (controllerPath): Remove. Adjust call to ptyopen. * clef/Makefile.in (clef_LDADD): Add extra C runtimes.
Diffstat (limited to 'src/clef')
-rw-r--r--src/clef/Makefile.in2
-rw-r--r--src/clef/edible.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index 42a233e4..764df763 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -41,7 +41,7 @@ clef_objects = $(clef_SOURCES:.c=.lo)
build_libdir = $(top_builddir)/src/lib
-clef_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core
+clef_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core $(oa_c_runtime_extra)
clef_DEPENDENCIES =
diff --git a/src/clef/edible.c b/src/clef/edible.c
index 069ff8f7..0e7b9756 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -101,7 +101,6 @@ int buff_flag[MAXLINE]; /** flags for whether buff chars
or non-printing **/
-char controllerPath[20]; /* path name for opening the controller side */
char serverPath[20]; /* path name for opening the server side */
int contNum, serverNum; /* file descriptors for pty's */
@@ -130,7 +129,7 @@ main(int argc, char *argv[])
/* try to get a pseudoterminal to play with */
- if (ptyopen(&contNum, &serverNum, controllerPath, serverPath) == -1) {
+ if (ptyopen(&contNum, &serverNum, serverPath) == -1) {
perror("ptyopen failed");
exit(-1);
}