Version bumped to 1.3.

[mdsms.git] / mdsms.c

diff --git a/mdsms.c b/mdsms.c
index 7f5a0e1..a7a9905 100644 (file)
--- a/mdsms.c
+++ b/mdsms.c
@@ -5,6 +5,12 @@ static char rcsid[] ATTR_UNUSED = "$Id$";
 
 /*
  * $Log$
 
 /*
  * $Log$

+ * Revision 1.6  1999/07/28 10:46:37  short
+ * Removed strict converting/checking of symbol characters to '?'.
+ *
+ * Revision 1.5  1999/07/19 10:02:51  short
+ * Removed '\xXY' chars for compatibility with Digital UNIX vendor "cc".
+ *

  * Revision 1.4  1999/07/14 01:01:11  short
  * Termios made compatible with Digital UNIX 4.0, cfset[io]speed() missing.
  *
  * Revision 1.4  1999/07/14 01:01:11  short
  * Termios made compatible with Digital UNIX 4.0, cfset[io]speed() missing.
  *


@@ -715,18 +721,19 @@ static char *pdudata;
 
 static inline unsigned char charconv(char c,size_t offs)
 {
 
 static inline unsigned char charconv(char c,size_t offs)
 {

-       if ((c>='A' && c<='Z') || (c>='a' && c<='z') || (c>='0' && c<='9')) return(c);

        switch (c) {
                case '@': return(0);
                case '$': return(2);
        switch (c) {
                case '@': return(0);
                case '$': return(2);

-               case '"': return(96);
-               case ' ':
-                       return(c);

                case 0: assert(0);
                case 0: assert(0);

+               default:
+                       return(c&0x7F);

                }
                }

+#if 0
+       if ((c>='A' && c<='Z') || (c>='a' && c<='z') || (c>='0' && c<='9')) return(c);

        error("Can't convert character '%c' (0x%02X) at offs %d (0-based), substituted '?'",
                c,(unsigned char)c,offs);
        return('?');
        error("Can't convert character '%c' (0x%02X) at offs %d (0-based), substituted '?'",
                c,(unsigned char)c,offs);
        return('?');

+#endif

 }
 
 static inline void genpdu(void)
 }
 
 static inline void genpdu(void)


@@ -914,12 +921,12 @@ time_t start,end;
 
        signal(SIGALRM,(RETSIGTYPE (*)(int))sigalarm);
        do {
 
        signal(SIGALRM,(RETSIGTYPE (*)(int))sigalarm);
        do {

-               devcmd("",NULL,"\r\nAT\x1A");
+               devcmd("",NULL,"\r\nAT\032");

                devcmd(NULL,NULL,"\r\nAT");
                smscset();
                devcmd(NULL,NULL,"\r\nAT+CMGF=0");
                devcmd("\n> ",NULL,"\r\nAT+CMGS=%d",(strlen(pdusmsc)+strlen(pdudata))/2);
                devcmd(NULL,NULL,"\r\nAT");
                smscset();
                devcmd(NULL,NULL,"\r\nAT+CMGF=0");
                devcmd("\n> ",NULL,"\r\nAT+CMGS=%d",(strlen(pdusmsc)+strlen(pdudata))/2);

-               if (!(s=devcmd(NULL,"\n+CMGS:","!%s%s\x1A",pdusmsc,pdudata))) retrying();
+               if (!(s=devcmd(NULL,"\n+CMGS:","!%s%s\032",pdusmsc,pdudata))) retrying();

                } while (!s);
        while (isspace(*s)) s++;
        if (verbose>=1) error("\nMessage successfuly sent with MR: %s",s);
                } while (!s);
        while (isspace(*s)) s++;
        if (verbose>=1) error("\nMessage successfuly sent with MR: %s",s);