Avoid using EL_GETFP.

[oota-llvm.git] / lib / LineEditor / LineEditor.cpp

diff --git a/lib/LineEditor/LineEditor.cpp b/lib/LineEditor/LineEditor.cpp
index 8b7c12a0fcfa454f781e5565a7cc0b867549d337..a50ccc388f154a2c22235fb65cd3be6a8d2f54dd 100644 (file)
--- a/lib/LineEditor/LineEditor.cpp
+++ b/lib/LineEditor/LineEditor.cpp
@@ -102,6 +102,8 @@ struct LineEditor::InternalData {
 
   unsigned PrevCount;
   std::string ContinuationOutput;
 
   unsigned PrevCount;
   std::string ContinuationOutput;

+
+  FILE *Out;

 };
 
 static const char *ElGetPromptFn(EditLine *EL) {
 };
 
 static const char *ElGetPromptFn(EditLine *EL) {


@@ -120,9 +122,7 @@ static unsigned char ElCompletionFn(EditLine *EL, int ch) {
   if (el_get(EL, EL_CLIENTDATA, &Data) == 0) {
     if (!Data->ContinuationOutput.empty()) {
       // This is the continuation of the AK_ShowCompletions branch below.
   if (el_get(EL, EL_CLIENTDATA, &Data) == 0) {
     if (!Data->ContinuationOutput.empty()) {
       // This is the continuation of the AK_ShowCompletions branch below.

-      FILE *Out;
-      if (::el_get(EL, EL_GETFP, 1, &Out) != 0)
-        return CC_ERROR;
+      FILE *Out = Data->Out;

 
       // Print the required output (see below).
       ::fwrite(Data->ContinuationOutput.c_str(),
 
       // Print the required output (see below).
       ::fwrite(Data->ContinuationOutput.c_str(),


@@ -131,7 +131,7 @@ static unsigned char ElCompletionFn(EditLine *EL, int ch) {
       // Push a sequence of Ctrl-B characters to move the cursor back to its
       // original position.
       std::string Prevs(Data->PrevCount, '\02');
       // Push a sequence of Ctrl-B characters to move the cursor back to its
       // original position.
       std::string Prevs(Data->PrevCount, '\02');

-      ::el_push(EL, (char *)Prevs.c_str());
+      ::el_push(EL, const_cast<char *>(Prevs.c_str()));

 
       Data->ContinuationOutput.clear();
 
 
       Data->ContinuationOutput.clear();
 


@@ -158,7 +158,7 @@ static unsigned char ElCompletionFn(EditLine *EL, int ch) {
         // from here to cause libedit to move the cursor immediately. This will
         // break horribly if the user has rebound their keys, so for now we do
         // not permit user rebinding.
         // from here to cause libedit to move the cursor immediately. This will
         // break horribly if the user has rebound their keys, so for now we do
         // not permit user rebinding.

-        ::el_push(EL, (char *)"\05\t");
+        ::el_push(EL, const_cast<char *>("\05\t"));

 
         // This assembles the output for the continuation block above.
         raw_string_ostream OS(Data->ContinuationOutput);
 
         // This assembles the output for the continuation block above.
         raw_string_ostream OS(Data->ContinuationOutput);


@@ -186,9 +186,8 @@ static unsigned char ElCompletionFn(EditLine *EL, int ch) {
         return CC_REFRESH;
       }
     }
         return CC_REFRESH;
       }
     }

-  } else {
-    return CC_ERROR;

   }
   }

+  return CC_ERROR;

 }
 
 LineEditor::LineEditor(StringRef ProgName, StringRef HistoryPath, FILE *In,
 }
 
 LineEditor::LineEditor(StringRef ProgName, StringRef HistoryPath, FILE *In,


@@ -199,6 +198,7 @@ LineEditor::LineEditor(StringRef ProgName, StringRef HistoryPath, FILE *In,
     this->HistoryPath = getDefaultHistoryPath(ProgName);
 
   Data->LE = this;
     this->HistoryPath = getDefaultHistoryPath(ProgName);
 
   Data->LE = this;

+  Data->Out = Out;

 
   Data->Hist = ::history_init();
   assert(Data->Hist);
 
   Data->Hist = ::history_init();
   assert(Data->Hist);


@@ -229,15 +229,9 @@ LineEditor::LineEditor(StringRef ProgName, StringRef HistoryPath, FILE *In,
 LineEditor::~LineEditor() {
   saveHistory();
 
 LineEditor::~LineEditor() {
   saveHistory();
 

-  FILE *Out;
-  if (::el_get(Data->EL, EL_GETFP, 1, &Out) != 0)
-    Out = 0;
-

   ::history_end(Data->Hist);
   ::el_end(Data->EL);
   ::history_end(Data->Hist);
   ::el_end(Data->EL);

-
-  if (Out)
-    ::fwrite("\n", 1, 1, Out);
+  ::fwrite("\n", 1, 1, Data->Out);

 }
 
 void LineEditor::saveHistory() {
 }
 
 void LineEditor::saveHistory() {