mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix piped mode, which was broken due to previous modifications in readline mode.

Browse source
This commit is contained in:
Simon Morlat 2014-07-04 17:22:39 +02:00
parent a2a896e362
commit 5c10337096
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
daemon/daemon.cc
View file

@ -720,11 +720,15 @@ void Daemon::startThread() {
ms_thread_create(&this->mThread, NULL, Daemon::iterateThread, this);
}
char *Daemon::readLine(const char *prompt) {
char *Daemon::readLine(const char *prompt, bool *eof) {
*eof=false;
#ifdef HAVE_READLINE
return readline(prompt);
#else
if (cin.eof()) return NULL;
if (cin.eof()) {
*eof=true;
return NULL;
}
cout << prompt;
char *buff = (char *) malloc(sLineSize);
cin.getline(buff, sLineSize);
@ -738,8 +742,9 @@ int Daemon::run() {
mRunning = true;
startThread();
while (mRunning) {
bool eof=false;
if (mServerFd == -1) {
ret = readLine(line);
ret = readLine(line,&eof);
if (ret && ret[0] != '\0') {
#ifdef HAVE_READLINE
add_history(ret);
@ -754,7 +759,7 @@ int Daemon::run() {
if (mServerFd == -1 && ret != NULL) {
free(ret);
}
if (!ret && mRunning) {
if (eof && mRunning) {
mRunning = false; // ctrl+d
cout << "Quitting..." << endl;
}
@ -838,27 +843,27 @@ int main(int argc, char *argv[]) {
return 0;
} else if (strcmp(argv[i], "--pipe") == 0) {
if (i + 1 >= argc) {
fprintf(stderr, "no pipe name specify after --pipe");
fprintf(stderr, "no pipe name specify after --pipe\n");
return -1;
}
pipe_name = argv[++i];
} else if (strcmp(argv[i], "--factory-config") == 0) {
if (i + 1 >= argc) {
fprintf(stderr, "no file specify after --factory-config");
fprintf(stderr, "no file specify after --factory-config\n");
return -1;
}
factory_config_path = argv[i + 1];
i++;
} else if (strcmp(argv[i], "--config") == 0) {
if (i + 1 >= argc) {
fprintf(stderr, "no file specify after --config");
fprintf(stderr, "no file specify after --config\n");
return -1;
}
config_path = argv[i + 1];
i++;
} else if (strcmp(argv[i], "--log") == 0) {
if (i + 1 >= argc) {
fprintf(stderr, "no file specify after --log");
fprintf(stderr, "no file specify after --log\n");
return -1;
}
log_file = argv[i + 1];

2
daemon/daemon.h
View file

@ -223,7 +223,7 @@ private:
void callStatsUpdated(LinphoneCall *call, const LinphoneCallStats *stats);
void dtmfReceived(LinphoneCall *call, int dtmf);
void execCommand(const char *cl);
char *readLine(const char *);
char *readLine(const char *, bool*);
char *readPipe(char *buffer, int buflen);
void iterate();
void iterateStreamStats();