diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-11-01 05:50:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-11-01 05:50:30 +0000 |
| commit | b9495611c4ec4ae6adc2aef08f9a08aaf5df6f1c (patch) | |
| tree | 2eb882ea95fa1b1e32156d7e881e109a97e13d3e /src/sman | |
| parent | ad6ac4dc3c9662098ad38ca99cbf46d6315af52b (diff) | |
| download | open-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/sman')
| -rw-r--r-- | src/sman/Makefile.in | 6 | ||||
| -rw-r--r-- | src/sman/sman.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index 53bb15c3..e87ff546 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -49,19 +49,19 @@ libspad_la = $(build_libdir)/libspad.$(LIBEXT) session_SOURCES = session.c session_objects = $(session_SOURCES:.c=.lo) -session_LDADD = $(libspad_la) @axiom_c_runtime_extra@ \ +session_LDADD = $(libspad_la) $(oa_c_runtime_extra) \ -L$(build_libdir) -lopen-axiom-core session_DEPENDENCIES = spadclient_SOURCES = spadclient.c spadclient_objects = $(spadclient_SOURCES:.c=.lo) -spadclient_LDADD = $(libspad_la) @axiom_c_runtime_extra@ \ +spadclient_LDADD = $(libspad_la) $(oa_c_runtime_extra) \ -L$(build_libdir) -lopen-axiom-core spadclient_DEPENDENCIES = sman_SOURCES = sman.c sman_objects = $(sman_SOURCES:.c=.lo) $(top_builddir)/src/driver/utils.lo -sman_LDADD = $(libspad_la) @axiom_c_runtime_extra@ \ +sman_LDADD = $(libspad_la) $(oa_c_runtime_extra) \ -L$(build_libdir) -lopen-axiom-core sman_DEPENDENCIES = diff --git a/src/sman/sman.c b/src/sman/sman.c index 8fa71a67..4488948a 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.c @@ -137,7 +137,7 @@ unsigned char _INTR, _QUIT, _ERASE, _KILL, _EOF, _EOL, _RES1, _RES2; /*************************************/ int ptsNum, ptcNum; -char ptsPath[20], ptcPath[20]; +char ptsPath[20]; char **new_envp; /* new environment for the core executable */ int child_pid; /* child's process id */ @@ -556,7 +556,7 @@ start_the_Axiom(char **envp) fprintf(stderr, "could not get an OpenAxiom server number\n"); exit(-1); } - if (ptyopen(&ptcNum, &ptsNum, ptcPath, ptsPath) == -1) { + if (ptyopen(&ptcNum, &ptsNum, ptsPath) == -1) { perror("start_the_Axiom: ptyopen failed"); exit(-1); } |