STATUSCODE: Add an ERRORCODE compatiblity

diff --git a/hfaxd/HylaFAXServer.h b/hfaxd/HylaFAXServer.h
index a7dbd58395cac718dc2b5e111a1e049b7a8f8b00..9f4b2305a81b8fdfa08a20c60a5d97765f45f5bc 100644 (file)
--- a/hfaxd/HylaFAXServer.h
+++ b/hfaxd/HylaFAXServer.h
@@ -116,7 +116,7 @@ enum Token {
     T_MAXTRIES,         T_MINBR,       T_MODEM,        T_NDIALS,       T_NOTIFY,
     T_NOTIFYADDR,T_NPAGES,     T_NTRIES,       T_OWNER,        T_PAGECHOP,
     T_PAGELENGTH,T_PAGEWIDTH,  T_PASSWD,       T_POLL,         T_REGARDING,
-    T_RETRYTIME, T_SCHEDPRI,   T_SENDTIME,     T_STATE,        T_STATUS,       T_STATUSCODE,
+    T_RETRYTIME, T_SCHEDPRI,   T_SENDTIME,     T_STATE,        T_STATUS,       T_STATUSCODE, T_ERRORCODE,
     T_SUBADDR,  T_TAGLINE,     T_TOTDIALS,     T_TOTPAGES,     T_TOTTRIES,
     T_TO_COMPANY,T_TO_LOCATION,        T_TO_USER,      T_TO_VOICE,     T_TSI,          T_USE_CONTCOVER,
     T_USE_ECM,  T_USE_TAGLINE, T_USE_XVRES,    T_USRKEY,       T_VRES,

diff --git a/hfaxd/Jobs.c++ b/hfaxd/Jobs.c++
index b35478c1ec6b629556db7dfe7f79c7545d09a25e..adec700fc493f498ea4b919469eaa9289bd0b689 100644 (file)
--- a/hfaxd/Jobs.c++
+++ b/hfaxd/Jobs.c++
@@ -115,6 +115,7 @@ static const struct {
     { T_DOCUMENT,      A_RUSR|A_WUSR|A_RADM|A_WADM|A_ROTH },
     { T_DONEOP,                A_RUSR|A_WUSR|A_RADM|A_WADM|A_ROTH },
     { T_EXTERNAL,      A_RUSR|A_WUSR|A_RADM|A_WADM|A_ROTH },
+    { T_ERRORCODE,     A_RUSR|A_RADM|A_ROTH },                 // compat STATUSCODE
     { T_FAXNUMBER,     A_RUSR|A_WUSR|A_RADM|A_WADM|A_ROTH },
     { T_FROM_COMPANY,  A_RUSR|A_WUSR|A_RADM|A_WADM|A_ROTH },
     { T_FROM_LOCATION, A_RUSR|A_WUSR|A_RADM|A_WADM|A_ROTH },
@@ -480,6 +481,9 @@ HylaFAXServer::replyJobParamValue(Job& job, int code, Token t)
        }
        reply(code, "End of polling items.");
        return;
+    case T_ERRORCODE:
+       reply(code, "E%03d", job.result.value());
+       return;
     case T_STATUSCODE:
        reply(code, "%03d", job.result.value());
        return;

diff --git a/hfaxd/Parser.c++ b/hfaxd/Parser.c++
index 5876a607321934922d24730573fab07fe86e6a39..f26bccaed79ae8c7e8279cde0298c7603fe039f0 100644 (file)
--- a/hfaxd/Parser.c++
+++ b/hfaxd/Parser.c++
@@ -130,6 +130,7 @@ static const tab parmtab[] = {
 { "DOCUMENT",     T_DOCUMENT,    false, true, "path-name" },
 { "DONEOP",       T_DONEOP,      false, true, "[<string>]" },
 { "EXTERNAL",     T_EXTERNAL,    false, true, "[<string>]" },
+{ "ERRORCODE",    T_ERRORCODE,   false, true, "[<string>]" },  // For compatiblity
 { "FAXNUMBER",    T_FAXNUMBER,   false, true, "[<string>]" },
 { "FROMCOMPANY",  T_FROM_COMPANY, false, true, "[<string>]" },
 { "FROMLOCATION", T_FROM_LOCATION,false, true, "[<string>]" },
@@ -1115,6 +1116,7 @@ HylaFAXServer::param_cmd(Token t)
     case T_STATE:
     case T_STATUS:
     case T_STATUSCODE:
+    case T_ERRORCODE:  // For compatibility
     case T_DONEOP:
     case T_COMMID:
     case T_REGARDING: