Merge remote-tracking branch 'mvo/bugfix/update-progress-reporting' into debian/exper...

[apt.git] / apt-pkg / contrib / error.cc

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 837d9e615345e4079960c32d81dea448d0a3bb64..892cd48742de54ced9117a26521607a5b8c38f26 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -13,18 +13,22 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/error.h>
 
 #include <apt-pkg/error.h>
 

+#include <stdarg.h>
+#include <stddef.h>
+#include <list>

 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <unistd.h>
 #include <unistd.h>

-

 #include <string>
 #include <cstring>
 
 #include <string>
 #include <cstring>
 

-#include "config.h"
-                                                                       /*}}}*/
+                                                                       /*}}}*/

 
 // Global Error Object                                                 /*{{{*/
 /* If the implementation supports posix threads then the accessor function
 
 // Global Error Object                                                 /*{{{*/
 /* If the implementation supports posix threads then the accessor function


@@ -57,93 +61,114 @@
 // GlobalError::GlobalError - Constructor                              /*{{{*/
 GlobalError::GlobalError() : PendingFlag(false) {}
                                                                        /*}}}*/
 // GlobalError::GlobalError - Constructor                              /*{{{*/
 GlobalError::GlobalError() : PendingFlag(false) {}
                                                                        /*}}}*/

-// GlobalError::FatalE - Get part of the error string from errno       /*{{{*/
-bool GlobalError::FatalE(const char *Function,const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return InsertErrno(FATAL, Function, Description, args);
-}
-                                                                       /*}}}*/
-// GlobalError::Errno - Get part of the error string from errno                /*{{{*/
-bool GlobalError::Errno(const char *Function,const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return InsertErrno(ERROR, Function, Description, args);
-}
-                                                                       /*}}}*/
-// GlobalError::WarningE - Get part of the warning string from errno   /*{{{*/
-bool GlobalError::WarningE(const char *Function,const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return InsertErrno(WARNING, Function, Description, args);
-}
-                                                                       /*}}}*/
-// GlobalError::NoticeE - Get part of the notice string from errno     /*{{{*/
-bool GlobalError::NoticeE(const char *Function,const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return InsertErrno(NOTICE, Function, Description, args);
+// GlobalError::FatalE, Errno, WarningE, NoticeE and DebugE - Add to the list/*{{{*/
+#define GEMessage(NAME, TYPE) \
+bool GlobalError::NAME (const char *Function, const char *Description,...) { \
+       va_list args; \
+       size_t msgSize = 400; \
+       int const errsv = errno; \
+       while (true) { \
+               va_start(args,Description); \
+               bool const retry = InsertErrno(TYPE, Function, Description, args, errsv, msgSize); \
+               va_end(args); \
+               if (retry == false) \
+                       break; \
+       } \
+       return false; \

 }
 }

+GEMessage(FatalE, FATAL)
+GEMessage(Errno, ERROR)
+GEMessage(WarningE, WARNING)
+GEMessage(NoticeE, NOTICE)
+GEMessage(DebugE, DEBUG)
+#undef GEMessage

                                                                        /*}}}*/
                                                                        /*}}}*/

-// GlobalError::DebugE - Get part of the debug string from errno       /*{{{*/
-bool GlobalError::DebugE(const char *Function,const char *Description,...) {
+// GlobalError::InsertErrno - Get part of the errortype string from errno/*{{{*/
+bool GlobalError::InsertErrno(MsgType const &type, const char *Function,
+                               const char *Description,...) {

        va_list args;
        va_list args;

-       va_start(args,Description);
-       return InsertErrno(DEBUG, Function, Description, args);
+       size_t msgSize = 400;
+       int const errsv = errno;
+       while (true) {
+               va_start(args,Description);
+               bool const retry = InsertErrno(type, Function, Description, args, errsv, msgSize);
+               va_end(args);
+               if (retry == false)
+                  break;
+       }
+       return false;

 }
                                                                        /*}}}*/
 // GlobalError::InsertErrno - formats an error message with the errno  /*{{{*/
 bool GlobalError::InsertErrno(MsgType type, const char* Function,
 }
                                                                        /*}}}*/
 // GlobalError::InsertErrno - formats an error message with the errno  /*{{{*/
 bool GlobalError::InsertErrno(MsgType type, const char* Function,

-                             const char* Description, va_list const &args) {
-       char S[400];
-       vsnprintf(S,sizeof(S),Description,args);
-       snprintf(S + strlen(S),sizeof(S) - strlen(S),
-                " - %s (%i: %s)", Function, errno, strerror(errno));
-       return Insert(type, S, args);
-}
-                                                                       /*}}}*/
-// GlobalError::Fatal - Add a fatal error to the list                  /*{{{*/
-bool GlobalError::Fatal(const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return Insert(FATAL, Description, args);
-}
-                                                                       /*}}}*/
-// GlobalError::Error - Add an error to the list                       /*{{{*/
-bool GlobalError::Error(const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return Insert(ERROR, Description, args);
-}
-                                                                       /*}}}*/
-// GlobalError::Warning - Add a warning to the list                    /*{{{*/
-bool GlobalError::Warning(const char *Description,...) {
-       va_list args;
-       va_start(args,Description);
-       return Insert(WARNING, Description, args);
+                             const char* Description, va_list &args,
+                             int const errsv, size_t &msgSize) {
+       char* S = (char*) malloc(msgSize);
+       int const n = snprintf(S, msgSize, "%s - %s (%i: %s)", Description,
+                              Function, errsv, strerror(errsv));
+       if (n > -1 && ((unsigned int) n) < msgSize);
+       else {
+               if (n > -1)
+                       msgSize = n + 1;
+               else
+                       msgSize *= 2;
+               free(S);
+               return true;
+       }
+
+       bool const geins = Insert(type, S, args, msgSize);
+       free(S);
+       return geins;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// GlobalError::Notice - Add a notice to the list                      /*{{{*/
-bool GlobalError::Notice(const char *Description,...)
-{
-       va_list args;
-       va_start(args,Description);
-       return Insert(NOTICE, Description, args);
+// GlobalError::Fatal, Error, Warning, Notice and Debug - Add to the list/*{{{*/
+#define GEMessage(NAME, TYPE) \
+bool GlobalError::NAME (const char *Description,...) { \
+       va_list args; \
+       size_t msgSize = 400; \
+       while (true) { \
+               va_start(args,Description); \
+               if (Insert(TYPE, Description, args, msgSize) == false) \
+                       break; \
+               va_end(args); \
+       } \
+       return false; \

 }
 }

+GEMessage(Fatal, FATAL)
+GEMessage(Error, ERROR)
+GEMessage(Warning, WARNING)
+GEMessage(Notice, NOTICE)
+GEMessage(Debug, DEBUG)
+#undef GEMessage

                                                                        /*}}}*/
                                                                        /*}}}*/

-// GlobalError::Debug - Add a debug to the list                                /*{{{*/
-bool GlobalError::Debug(const char *Description,...)
+// GlobalError::Insert - Add a errotype message to the list            /*{{{*/
+bool GlobalError::Insert(MsgType const &type, const char *Description,...)

 {
        va_list args;
 {
        va_list args;

-       va_start(args,Description);
-       return Insert(DEBUG, Description, args);
+       size_t msgSize = 400;
+       while (true) {
+               va_start(args,Description);
+               if (Insert(type, Description, args, msgSize) == false)
+                       break;
+               va_end(args);
+       }
+       return false;

 }
                                                                        /*}}}*/
 // GlobalError::Insert - Insert a new item at the end                  /*{{{*/
 bool GlobalError::Insert(MsgType type, const char* Description,
 }
                                                                        /*}}}*/
 // GlobalError::Insert - Insert a new item at the end                  /*{{{*/
 bool GlobalError::Insert(MsgType type, const char* Description,

-                        va_list const &args) {
-       char S[400];
-       vsnprintf(S,sizeof(S),Description,args);
+                        va_list &args, size_t &msgSize) {
+       char* S = (char*) malloc(msgSize);
+       int const n = vsnprintf(S, msgSize, Description, args);
+       if (n > -1 && ((unsigned int) n) < msgSize);
+       else {
+               if (n > -1)
+                       msgSize = n + 1;
+               else
+                       msgSize *= 2;
+               free(S);
+               return true;
+       }

 
        Item const m(S, type);
        Messages.push_back(m);
 
        Item const m(S, type);
        Messages.push_back(m);


@@ -154,6 +179,7 @@ bool GlobalError::Insert(MsgType type, const char* Description,
        if (type == FATAL || type == DEBUG)
                std::clog << m << std::endl;
 
        if (type == FATAL || type == DEBUG)
                std::clog << m << std::endl;
 

+       free(S);

        return false;
 }
                                                                        /*}}}*/
        return false;
 }
                                                                        /*}}}*/


@@ -172,7 +198,7 @@ bool GlobalError::PopMessage(std::string &Text) {
 
        // check if another error message is pending
        for (std::list<Item>::const_iterator m = Messages.begin();
 
        // check if another error message is pending
        for (std::list<Item>::const_iterator m = Messages.begin();

-            m != Messages.end(); m++)
+            m != Messages.end(); ++m)

                if (m->Type == ERROR || m->Type == FATAL)
                        return Ret;
 
                if (m->Type == ERROR || m->Type == FATAL)
                        return Ret;
 


@@ -181,10 +207,16 @@ bool GlobalError::PopMessage(std::string &Text) {
 }
                                                                        /*}}}*/
 // GlobalError::DumpErrors - Dump all of the errors/warns to cerr      /*{{{*/
 }
                                                                        /*}}}*/
 // GlobalError::DumpErrors - Dump all of the errors/warns to cerr      /*{{{*/

-void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold) {
+void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold,
+                            bool const &mergeStack) {
+       if (mergeStack == true)
+               for (std::list<MsgStack>::const_reverse_iterator s = Stacks.rbegin();
+                    s != Stacks.rend(); ++s)
+                       Messages.insert(Messages.begin(), s->Messages.begin(), s->Messages.end());
+

        for (std::list<Item>::const_iterator m = Messages.begin();
        for (std::list<Item>::const_iterator m = Messages.begin();

-            m != Messages.end(); m++)
-               if (m->Type >= trashhold)
+            m != Messages.end(); ++m)
+               if (m->Type >= threshold)

                        out << (*m) << std::endl;
        Discard();
 }
                        out << (*m) << std::endl;
        Discard();
 }


@@ -193,7 +225,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &trashhold) {
 void GlobalError::Discard() {
        Messages.clear();
        PendingFlag = false;
 void GlobalError::Discard() {
        Messages.clear();
        PendingFlag = false;

-};
+}

                                                                        /*}}}*/
 // GlobalError::empty - does our error list include anything?          /*{{{*/
 bool GlobalError::empty(MsgType const &trashhold) const {
                                                                        /*}}}*/
 // GlobalError::empty - does our error list include anything?          /*{{{*/
 bool GlobalError::empty(MsgType const &trashhold) const {


@@ -204,10 +236,34 @@ bool GlobalError::empty(MsgType const &trashhold) const {
                return true;
 
        for (std::list<Item>::const_iterator m = Messages.begin();
                return true;
 
        for (std::list<Item>::const_iterator m = Messages.begin();

-            m != Messages.end(); m++)
+            m != Messages.end(); ++m)

                if (m->Type >= trashhold)
                        return false;
 
        return true;
 }
                                                                        /*}}}*/
                if (m->Type >= trashhold)
                        return false;
 
        return true;
 }
                                                                        /*}}}*/

+// GlobalError::PushToStack                                            /*{{{*/
+void GlobalError::PushToStack() {
+       MsgStack pack(Messages, PendingFlag);
+       Stacks.push_back(pack);
+       Discard();
+}
+                                                                       /*}}}*/
+// GlobalError::RevertToStack                                          /*{{{*/
+void GlobalError::RevertToStack() {
+       Discard();
+       MsgStack pack = Stacks.back();
+       Messages = pack.Messages;
+       PendingFlag = pack.PendingFlag;
+       Stacks.pop_back();
+}
+                                                                       /*}}}*/
+// GlobalError::MergeWithStack                                         /*{{{*/
+void GlobalError::MergeWithStack() {
+       MsgStack pack = Stacks.back();
+       Messages.insert(Messages.begin(), pack.Messages.begin(), pack.Messages.end());
+       PendingFlag = PendingFlag || pack.PendingFlag;
+       Stacks.pop_back();
+}
+                                                                       /*}}}*/