Bug 547: correct code to match documentation

diff --git a/CHANGES b/CHANGES
index d646e9ea963ddcdf5409ec9ad735aa3105c766f3..8bf97b4d6ada0c58c4345b786e3634779ad1b098 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@ Changelog for HylaFAX 4.2.1
 
 * improve modern distinctive ring support, add
   NoAnswerVoice config feature, and enhance third-party
-  getty interaction (1 Jan 2005)
+  getty interaction (1, 2 Jan 2005)
 * add support for etc/resetmodem (30 Dec 2004)
 * fix NOTIFY_FAXMASTER within notify (30 Dec 2004)
 * improve tiff2pdf and use it more (29 Dec 2004)

diff --git a/faxd/ModemConfig.c++ b/faxd/ModemConfig.c++
index 41d1f89dabdbc5ed92e0b4cfe9fd6f502222f1c7..d7a326318acf2f946cf9a25c0d7b3eb734f2833c 100644 (file)
--- a/faxd/ModemConfig.c++
+++ b/faxd/ModemConfig.c++
@@ -596,16 +596,20 @@ ModemConfig::processDRString(char* cp, const u_int i)
     else if (*cp == 'D')
        distinctiveRings[i].type = ClassModem::CALLTYPE_DATA;
 
+    while (*cp != '-'){ cp++;}
+    *cp = '\0';
     u_int j = 0;
-    char *cp1 = cp += 2;
+    int sign = 1;
+    char *cp1 = cp += 1;
     while (*cp++) {
-       if (*cp == ':') {
-           *cp = '\0';                             // Nuke the ':'
-           distinctiveRings[i].cadence[j++] = atoi(cp1);
+       if (*cp == '-') {
+           *cp = '\0';                             // Nuke the '-'
+           distinctiveRings[i].cadence[j++] = sign*atoi(cp1);
+           sign = -sign;
            cp1 = ++cp;
        }
     }
-    distinctiveRings[i].cadence[j] =  atoi(cp1);
+    distinctiveRings[i].cadence[j] =  sign*atoi(cp1);
 
     double sum = 0;
     for ( u_int k=0; k < 5; ++k )