[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-138-ge054ce4

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  e054ce44575ff65f7697808e40a86cffcc4c7e20 (commit)
      from  9f7afd0b097081f9f94e2162802ed44ed251f11b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=e054ce44575ff65f7697808e40a86cffcc4c7e20


commit e054ce44575ff65f7697808e40a86cffcc4c7e20
Author: Daniele Forsi <address@hidden>
Date:   Wed Nov 25 23:47:27 2009 +0100

    Fix sending multipart 8-bit SMS, add tests

diff --git a/ChangeLog b/ChangeLog
index 6f73e46..fce3b27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@
       backward compatibility is preserved               (Paweł Kot)
     o fallback to use mbrtowc()/wcrtomb() or mbtowc()/wctomb() if
       iconv_open() fails                            (Daniele Forsi)
+    o fix sending multipart 8-bit SMS               (Daniele Forsi)
  * build system updates
     o remove GNOKII_API from the definition of asprinf
                                                       (Jari Turkia)
diff --git a/common/gsm-sms.c b/common/gsm-sms.c
index 1bd6a1a..8b438b2 100644
--- a/common/gsm-sms.c
+++ b/common/gsm-sms.c
@@ -1771,6 +1771,16 @@ static gn_error sms_send_long(gn_data *data, struct 
gn_statemachine *state)
                        dprintf("DEBUG: copied: %d\n", copied);
                        break;
                default:
+                       start += copied;
+                       if (ud[0].length - start >= max_sms_len) {
+                               copied = max_sms_len;
+                       } else {
+                               copied = (ud[0].length - start) % (max_sms_len);
+                       }
+                       memset(&data->sms->user_data[0], 0, 
sizeof(gn_sms_user_data));
+                       data->sms->user_data[0].type = ud[0].type;
+                       data->sms->user_data[0].length = copied;
+                       memcpy(data->sms->user_data[0].u.text, 
ud[0].u.text+start, copied);
                        switch (ud[0].type) {
                        case GN_SMS_DATA_Bitmap:
                                break;
diff --git a/testsuite/8bit-140.bin b/testsuite/8bit-140.bin
new file mode 100644
index 0000000..f45a1f6
--- /dev/null
+++ b/testsuite/8bit-140.bin
@@ -0,0 +1,2 @@
+Œ
      
+
 !"#$%&'()*+,-./0123456789:;<=>address@hidden|}~€‚ƒ„…†‡ˆ‰Š‹
\ No newline at end of file
diff --git a/testsuite/8bit-141.bin b/testsuite/8bit-141.bin
new file mode 100644
index 0000000..90c9942
--- /dev/null
+++ b/testsuite/8bit-141.bin
@@ -0,0 +1,2 @@
+
      
+
 !"#$%&'()*+,-./0123456789:;<=>address@hidden|}~€‚ƒ„…†‡ˆ‰Š‹Œ
\ No newline at end of file
diff --git a/testsuite/out.33.send140sms8bit b/testsuite/out.33.send140sms8bit
new file mode 100644
index 0000000..4d80baa
--- /dev/null
+++ b/testsuite/out.33.send140sms8bit
@@ -0,0 +1,3 @@
+AT+???=149
+0011000181F000F4008C8C0102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B
+Send succeeded with reference 1!
diff --git a/testsuite/out.34.send141sms8bit b/testsuite/out.34.send141sms8bit
new file mode 100644
index 0000000..b9f9ed7
--- /dev/null
+++ b/testsuite/out.34.send141sms8bit
@@ -0,0 +1,5 @@
+AT+???=149
+0051000181F000F4008C050003CE02018D0102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485
+AT+???=22
+0051000181F000F4000D050003CE0202868788898A8B8C
+Message sent in 2 parts with reference numbers: 1 1
diff --git a/testsuite/test.33.send140sms8bit b/testsuite/test.33.send140sms8bit
new file mode 100644
index 0000000..aadee85
--- /dev/null
+++ b/testsuite/test.33.send140sms8bit
@@ -0,0 +1,2 @@
+# Send exactly 140 8-bit chars with 1 SMS
+$GNOKII --sendsms 0 --8bit <8bit-140.bin
diff --git a/testsuite/test.34.send141sms8bit b/testsuite/test.34.send141sms8bit
new file mode 100644
index 0000000..7c96251
--- /dev/null
+++ b/testsuite/test.34.send141sms8bit
@@ -0,0 +1,2 @@
+# Send exactly 141 8-bit chars with 2 SMS
+$GNOKII --sendsms 0 --8bit <8bit-141.bin
diff --git a/testsuite/testit b/testsuite/testit
index f6e3c51..9e1de1f 100755
--- a/testsuite/testit
+++ b/testsuite/testit
@@ -24,6 +24,7 @@ cd $TESTDIR
 #   - test.27.cimelody2
 for A in test.0.identify \
        test.1.sms test.29.sendsms test.30.emptysms test.3.ucs2sms 
test.8.send161sms\
+       test.33.send140sms8bit test.34.send141sms8bit \
        test.10.oplogo test.14.oplogo-xpm \
        test.11.ringtone \
        test.13.emspicture test.15.emspicture2 test.18.emsanimation \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    1 +
 common/gsm-sms.c                 |   10 ++++++++++
 testsuite/8bit-140.bin           |    2 ++
 testsuite/8bit-141.bin           |    2 ++
 testsuite/out.33.send140sms8bit  |    3 +++
 testsuite/out.34.send141sms8bit  |    5 +++++
 testsuite/test.33.send140sms8bit |    2 ++
 testsuite/test.34.send141sms8bit |    2 ++
 testsuite/testit                 |    1 +
 9 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 testsuite/8bit-140.bin
 create mode 100644 testsuite/8bit-141.bin
 create mode 100644 testsuite/out.33.send140sms8bit
 create mode 100644 testsuite/out.34.send141sms8bit
 create mode 100644 testsuite/test.33.send140sms8bit
 create mode 100644 testsuite/test.34.send141sms8bit


hooks/post-receive
-- 
libgnokii and core programs