summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2010-03-18 15:18:24 +0100
committerClément DAVID <clement.david@scilab.org>2010-03-18 15:18:24 +0100
commit8bfb36321d652a930076e16213c5ab85a0041038 (patch)
tree9de5af26b3d80e35e5961cfb4413003159b9a337 /scilab/modules/shell
parenta2416ecf2d2ce96abbcad51810d6e42ff4264475 (diff)
parenta4b1a02b0e330bddd5e1ca849eab7730e7320b85 (diff)
downloadscilab-8bfb36321d652a930076e16213c5ab85a0041038.zip
scilab-8bfb36321d652a930076e16213c5ab85a0041038.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/scicos/macros/scicos_scicos/bad_connection.sci
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/src/c/GetCommandLine.c38
1 files changed, 22 insertions, 16 deletions
diff --git a/scilab/modules/shell/src/c/GetCommandLine.c b/scilab/modules/shell/src/c/GetCommandLine.c
index bf244a1..01f7b31 100644
--- a/scilab/modules/shell/src/c/GetCommandLine.c
+++ b/scilab/modules/shell/src/c/GetCommandLine.c
@@ -189,30 +189,36 @@ void C2F(zzledt)(char *buffer,int *buf_size,int *len_line,int * eof,
189 189
190 __LockSignal(&ReadyForLaunch); 190 __LockSignal(&ReadyForLaunch);
191 191
192 if (__CommandLine) { FREE(__CommandLine); __CommandLine = NULL;} 192 if (__CommandLine)
193 {
194 FREE(__CommandLine);
195 __CommandLine = NULL;
196 }
193 __CommandLine = strdup(""); 197 __CommandLine = strdup("");
194 198
195 if (ismenu() == 0) 199 if (ismenu() == 0)
196 { 200 {
197 if (!WatchGetCmdLineThreadAlive) 201 if (!WatchGetCmdLineThreadAlive)
198 { 202 {
199 if (WatchGetCmdLineThread) { 203 if (WatchGetCmdLineThread)
200 __WaitThreadDie(WatchGetCmdLineThread); 204 {
205 __WaitThreadDie(WatchGetCmdLineThread);
206 }
207 __CreateThread(&WatchGetCmdLineThread, &watchGetCommandLine);
208 WatchGetCmdLineThreadAlive = TRUE;
201 } 209 }
202 __CreateThread(&WatchGetCmdLineThread, &watchGetCommandLine);
203 WatchGetCmdLineThreadAlive = TRUE;
204 }
205 if (!WatchStoreCmdThreadAlive) 210 if (!WatchStoreCmdThreadAlive)
206 { 211 {
207 if (WatchStoreCmdThread) { 212 if (WatchStoreCmdThread)
208 __WaitThreadDie(WatchStoreCmdThread); 213 {
214 __WaitThreadDie(WatchStoreCmdThread);
215 }
216 __CreateThread(&WatchStoreCmdThread, &watchStoreCommand);
217 WatchStoreCmdThreadAlive = TRUE;
209 } 218 }
210 __CreateThread(&WatchStoreCmdThread, &watchStoreCommand);
211 WatchStoreCmdThreadAlive = TRUE;
212 }
213 219
214 __Wait(&TimeToWork, &ReadyForLaunch); 220 __Wait(&TimeToWork, &ReadyForLaunch);
215 } 221 }
216 __UnLockSignal(&ReadyForLaunch); 222 __UnLockSignal(&ReadyForLaunch);
217 223
218 /* 224 /*